diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index f3560e0..c7b103c 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/.cxx/cmake/debug/arm64-v8a/.ninja_deps b/app/.cxx/cmake/debug/arm64-v8a/.ninja_deps index 1e151a8..592c828 100644 Binary files a/app/.cxx/cmake/debug/arm64-v8a/.ninja_deps and b/app/.cxx/cmake/debug/arm64-v8a/.ninja_deps differ diff --git a/app/.cxx/cmake/debug/arm64-v8a/.ninja_log b/app/.cxx/cmake/debug/arm64-v8a/.ninja_log index 3dd4e33..7b457e6 100644 --- a/app/.cxx/cmake/debug/arm64-v8a/.ninja_log +++ b/app/.cxx/cmake/debug/arm64-v8a/.ninja_log @@ -1,15 +1,3 @@ # ninja log v5 -0 48 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o ed7d5b467f7db8a2 -48 65 0 ../../../../build/intermediates/cmake/debug/obj/arm64-v8a/libdjivideojni.so 313f8512daac0489 -0 68 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o ed7d5b467f7db8a2 -68 80 0 ../../../../build/intermediates/cmake/debug/obj/arm64-v8a/libdjivideojni.so 313f8512daac0489 -1 84 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o ed7d5b467f7db8a2 -84 105 0 ../../../../build/intermediates/cmake/debug/obj/arm64-v8a/libdjivideojni.so 313f8512daac0489 -0 54 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o ed7d5b467f7db8a2 -54 69 0 ../../../../build/intermediates/cmake/debug/obj/arm64-v8a/libdjivideojni.so 313f8512daac0489 -0 62 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o ed7d5b467f7db8a2 -62 77 0 ../../../../build/intermediates/cmake/debug/obj/arm64-v8a/libdjivideojni.so 313f8512daac0489 -1 166 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o ed7d5b467f7db8a2 -166 202 0 ../../../../build/intermediates/cmake/debug/obj/arm64-v8a/libdjivideojni.so 313f8512daac0489 -0 50 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o ed7d5b467f7db8a2 -51 64 0 ../../../../build/intermediates/cmake/debug/obj/arm64-v8a/libdjivideojni.so 313f8512daac0489 +0 121 1607019444 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o c036448c0db31092 +122 185 1607019445 ../../../../build/intermediates/cmake/debug/obj/arm64-v8a/libdjivideojni.so 2bd6d46e6034a178 diff --git a/app/.cxx/cmake/debug/arm64-v8a/CMakeCache.txt b/app/.cxx/cmake/debug/arm64-v8a/CMakeCache.txt index c228e6d..4984bc1 100644 --- a/app/.cxx/cmake/debug/arm64-v8a/CMakeCache.txt +++ b/app/.cxx/cmake/debug/arm64-v8a/CMakeCache.txt @@ -1,6 +1,6 @@ # This is the CMakeCache file. -# For build in directory: /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a -# It was generated by CMake: /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake +# For build in directory: /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a +# It was generated by CMake: /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. # If you do want to change a value, simply edit, save, and exit the editor. @@ -18,13 +18,19 @@ ANDROID_ABI:UNINITIALIZED=arm64-v8a //No help, variable specified on the command line. -ANDROID_NDK:UNINITIALIZED=/home/smartdrone/Android/Sdk/ndk/21.3.6528147 +ANDROID_NDK:UNINITIALIZED=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 //No help, variable specified on the command line. ANDROID_PLATFORM:UNINITIALIZED=android-22 +//No help, variable specified on the command line. +CMAKE_ANDROID_ARCH_ABI:UNINITIALIZED=arm64-v8a + +//No help, variable specified on the command line. +CMAKE_ANDROID_NDK:UNINITIALIZED=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 + //Archiver -CMAKE_AR:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar +CMAKE_AR:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android-ar //Flags used by the compiler during all build types. CMAKE_ASM_FLAGS:STRING= @@ -39,6 +45,12 @@ CMAKE_ASM_FLAGS_RELEASE:STRING= // CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel. CMAKE_BUILD_TYPE:STRING=Debug +//LLVM archiver +CMAKE_CXX_COMPILER_AR:FILEPATH=CMAKE_CXX_COMPILER_AR-NOTFOUND + +//Generate index for LLVM archive +CMAKE_CXX_COMPILER_RANLIB:FILEPATH=CMAKE_CXX_COMPILER_RANLIB-NOTFOUND + //Flags used by the compiler during all build types. CMAKE_CXX_FLAGS:STRING= @@ -58,6 +70,12 @@ CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG //Libraries linked by default with all C++ applications. CMAKE_CXX_STANDARD_LIBRARIES:STRING=-latomic -lm +//LLVM archiver +CMAKE_C_COMPILER_AR:FILEPATH=CMAKE_C_COMPILER_AR-NOTFOUND + +//Generate index for LLVM archive +CMAKE_C_COMPILER_RANLIB:FILEPATH=CMAKE_C_COMPILER_RANLIB-NOTFOUND + //Flags used by the compiler during all build types. CMAKE_C_FLAGS:STRING= @@ -93,19 +111,22 @@ CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING= CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Enable/Disable output of compile commands during generation. -CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF +CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON + +//No help, variable specified on the command line. +CMAKE_FIND_ROOT_PATH:UNINITIALIZED=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/prefab/arm64-v8a/prefab //Install path prefix, prepended onto install directories. CMAKE_INSTALL_PREFIX:PATH=/usr/local //No help, variable specified on the command line. -CMAKE_LIBRARY_OUTPUT_DIRECTORY:UNINITIALIZED=/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj/arm64-v8a +CMAKE_LIBRARY_OUTPUT_DIRECTORY:UNINITIALIZED=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/debug/obj/arm64-v8a //Path to a program. -CMAKE_LINKER:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ld +CMAKE_LINKER:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android-ld //No help, variable specified on the command line. -CMAKE_MAKE_PROGRAM:UNINITIALIZED=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja +CMAKE_MAKE_PROGRAM:UNINITIALIZED=/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja //Flags used by the linker during the creation of modules. CMAKE_MODULE_LINKER_FLAGS:STRING= @@ -123,19 +144,19 @@ CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Path to a program. -CMAKE_NM:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-nm +CMAKE_NM:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android-nm //Path to a program. -CMAKE_OBJCOPY:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-objcopy +CMAKE_OBJCOPY:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android-objcopy //Path to a program. -CMAKE_OBJDUMP:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-objdump +CMAKE_OBJDUMP:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android-objdump //Value Computed by CMake CMAKE_PROJECT_NAME:STATIC=Project //Ranlib -CMAKE_RANLIB:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ranlib +CMAKE_RANLIB:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android-ranlib //Flags used by the linker during the creation of dll's. CMAKE_SHARED_LINKER_FLAGS:STRING= @@ -175,10 +196,16 @@ CMAKE_STATIC_LINKER_FLAGS_RELEASE:STRING= CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Path to a program. -CMAKE_STRIP:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-strip +CMAKE_STRIP:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android-strip + +//No help, variable specified on the command line. +CMAKE_SYSTEM_NAME:UNINITIALIZED=Android + +//No help, variable specified on the command line. +CMAKE_SYSTEM_VERSION:UNINITIALIZED=22 //The CMake toolchain file -CMAKE_TOOLCHAIN_FILE:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake +CMAKE_TOOLCHAIN_FILE:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake //If this value is on, makefiles will be generated without the // .SILENT directive, and all commands will be echoed to the console @@ -187,16 +214,16 @@ CMAKE_TOOLCHAIN_FILE:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/buil CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE //Value Computed by CMake -Project_BINARY_DIR:STATIC=/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a +Project_BINARY_DIR:STATIC=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a //Value Computed by CMake -Project_SOURCE_DIR:STATIC=/home/smartdrone/Working_Private/rosettadrone_work/app +Project_SOURCE_DIR:STATIC=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app //Dependencies for the target -djivideojni_LIB_DEPENDS:STATIC=general;ffmpegjni;general;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/22/liblog.so; +djivideojni_LIB_DEPENDS:STATIC=general;ffmpegjni;general;/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/22/liblog.so; //Path to a library. -log-lib:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/22/liblog.so +log-lib:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/22/liblog.so ######################## @@ -206,19 +233,23 @@ log-lib:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/p //ADVANCED property for variable: CMAKE_AR CMAKE_AR-ADVANCED:INTERNAL=1 //This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a +CMAKE_CACHEFILE_DIR:INTERNAL=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3 //Minor version of cmake used to create the current loaded cache -CMAKE_CACHE_MINOR_VERSION:INTERNAL=6 +CMAKE_CACHE_MINOR_VERSION:INTERNAL=10 //Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=0 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=2 //Path to CMake executable. -CMAKE_COMMAND:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake +CMAKE_COMMAND:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake //Path to cpack program executable. -CMAKE_CPACK_COMMAND:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cpack +CMAKE_CPACK_COMMAND:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cpack //Path to ctest program executable. -CMAKE_CTEST_COMMAND:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ctest +CMAKE_CTEST_COMMAND:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/ctest +//ADVANCED property for variable: CMAKE_CXX_COMPILER_AR +CMAKE_CXX_COMPILER_AR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_CXX_COMPILER_RANLIB +CMAKE_CXX_COMPILER_RANLIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG @@ -231,6 +262,10 @@ CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1 CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_STANDARD_LIBRARIES CMAKE_CXX_STANDARD_LIBRARIES-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_COMPILER_AR +CMAKE_C_COMPILER_AR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_COMPILER_RANLIB +CMAKE_C_COMPILER_RANLIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_C_FLAGS CMAKE_C_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG @@ -256,7 +291,7 @@ CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1 //Name of external makefile project generator. -CMAKE_EXTRA_GENERATOR:INTERNAL=Android Gradle +CMAKE_EXTRA_GENERATOR:INTERNAL= //Name of generator. CMAKE_GENERATOR:INTERNAL=Ninja //Name of generator platform. @@ -265,9 +300,9 @@ CMAKE_GENERATOR_PLATFORM:INTERNAL= CMAKE_GENERATOR_TOOLSET:INTERNAL= //Source directory with the top level CMakeLists.txt file for this // project -CMAKE_HOME_DIRECTORY:INTERNAL=/home/smartdrone/Working_Private/rosettadrone_work/app +CMAKE_HOME_DIRECTORY:INTERNAL=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app //Install .so files without execute permission. -CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1 +CMAKE_INSTALL_SO_NO_EXE:INTERNAL=0 //ADVANCED property for variable: CMAKE_LINKER CMAKE_LINKER-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS @@ -288,10 +323,12 @@ CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1 CMAKE_OBJCOPY-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_OBJDUMP CMAKE_OBJDUMP-ADVANCED:INTERNAL=1 +//Platform information initialized +CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1 //ADVANCED property for variable: CMAKE_RANLIB CMAKE_RANLIB-ADVANCED:INTERNAL=1 //Path to CMake installation. -CMAKE_ROOT:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6 +CMAKE_ROOT:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG @@ -319,7 +356,7 @@ CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_STRIP CMAKE_STRIP-ADVANCED:INTERNAL=1 //uname command -CMAKE_UNAME:INTERNAL=/bin/uname +CMAKE_UNAME:INTERNAL=/usr/bin/uname //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 diff --git a/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake b/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake deleted file mode 100644 index b994e59..0000000 --- a/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake +++ /dev/null @@ -1,67 +0,0 @@ -set(CMAKE_C_COMPILER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang") -set(CMAKE_C_COMPILER_ARG1 "") -set(CMAKE_C_COMPILER_ID "Clang") -set(CMAKE_C_COMPILER_VERSION "9.0") -set(CMAKE_C_COMPILER_WRAPPER "") -set(CMAKE_C_STANDARD_COMPUTED_DEFAULT "11") -set(CMAKE_C_COMPILE_FEATURES "c_function_prototypes;c_restrict;c_variadic_macros;c_static_assert") -set(CMAKE_C90_COMPILE_FEATURES "c_function_prototypes") -set(CMAKE_C99_COMPILE_FEATURES "c_restrict;c_variadic_macros") -set(CMAKE_C11_COMPILE_FEATURES "c_static_assert") - -set(CMAKE_C_PLATFORM_ID "") -set(CMAKE_C_SIMULATE_ID "") -set(CMAKE_C_SIMULATE_VERSION "") - -set(CMAKE_AR "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar") -set(CMAKE_RANLIB "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ranlib") -set(CMAKE_LINKER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ld") -set(CMAKE_COMPILER_IS_GNUCC ) -set(CMAKE_C_COMPILER_LOADED 1) -set(CMAKE_C_COMPILER_WORKS TRUE) -set(CMAKE_C_ABI_COMPILED TRUE) -set(CMAKE_COMPILER_IS_MINGW ) -set(CMAKE_COMPILER_IS_CYGWIN ) -if(CMAKE_COMPILER_IS_CYGWIN) - set(CYGWIN 1) - set(UNIX 1) -endif() - -set(CMAKE_C_COMPILER_ENV_VAR "CC") - -if(CMAKE_COMPILER_IS_MINGW) - set(MINGW 1) -endif() -set(CMAKE_C_COMPILER_ID_RUN 1) -set(CMAKE_C_SOURCE_FILE_EXTENSIONS c;m) -set(CMAKE_C_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC) -set(CMAKE_C_LINKER_PREFERENCE 10) - -# Save compiler ABI information. -set(CMAKE_C_SIZEOF_DATA_PTR "8") -set(CMAKE_C_COMPILER_ABI "ELF") -set(CMAKE_C_LIBRARY_ARCHITECTURE "") - -if(CMAKE_C_SIZEOF_DATA_PTR) - set(CMAKE_SIZEOF_VOID_P "${CMAKE_C_SIZEOF_DATA_PTR}") -endif() - -if(CMAKE_C_COMPILER_ABI) - set(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_C_COMPILER_ABI}") -endif() - -if(CMAKE_C_LIBRARY_ARCHITECTURE) - set(CMAKE_LIBRARY_ARCHITECTURE "") -endif() - -set(CMAKE_C_CL_SHOWINCLUDES_PREFIX "") -if(CMAKE_C_CL_SHOWINCLUDES_PREFIX) - set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_C_CL_SHOWINCLUDES_PREFIX}") -endif() - - - - -set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "dl;c;dl") -set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/9.0.8/lib/linux/aarch64;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib/gcc/aarch64-linux-android/4.9.x;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/aarch64-linux-android/lib64;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/22;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/aarch64-linux-android/lib;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib") -set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "") diff --git a/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake b/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake deleted file mode 100644 index a574557..0000000 --- a/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake +++ /dev/null @@ -1,68 +0,0 @@ -set(CMAKE_CXX_COMPILER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++") -set(CMAKE_CXX_COMPILER_ARG1 "") -set(CMAKE_CXX_COMPILER_ID "Clang") -set(CMAKE_CXX_COMPILER_VERSION "9.0") -set(CMAKE_CXX_COMPILER_WRAPPER "") -set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT "14") -set(CMAKE_CXX_COMPILE_FEATURES "cxx_template_template_parameters;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates") -set(CMAKE_CXX98_COMPILE_FEATURES "cxx_template_template_parameters") -set(CMAKE_CXX11_COMPILE_FEATURES "cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates") -set(CMAKE_CXX14_COMPILE_FEATURES "cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates") - -set(CMAKE_CXX_PLATFORM_ID "") -set(CMAKE_CXX_SIMULATE_ID "") -set(CMAKE_CXX_SIMULATE_VERSION "") - -set(CMAKE_AR "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar") -set(CMAKE_RANLIB "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ranlib") -set(CMAKE_LINKER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ld") -set(CMAKE_COMPILER_IS_GNUCXX ) -set(CMAKE_CXX_COMPILER_LOADED 1) -set(CMAKE_CXX_COMPILER_WORKS TRUE) -set(CMAKE_CXX_ABI_COMPILED TRUE) -set(CMAKE_COMPILER_IS_MINGW ) -set(CMAKE_COMPILER_IS_CYGWIN ) -if(CMAKE_COMPILER_IS_CYGWIN) - set(CYGWIN 1) - set(UNIX 1) -endif() - -set(CMAKE_CXX_COMPILER_ENV_VAR "CXX") - -if(CMAKE_COMPILER_IS_MINGW) - set(MINGW 1) -endif() -set(CMAKE_CXX_COMPILER_ID_RUN 1) -set(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC) -set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;mm;CPP) -set(CMAKE_CXX_LINKER_PREFERENCE 30) -set(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1) - -# Save compiler ABI information. -set(CMAKE_CXX_SIZEOF_DATA_PTR "8") -set(CMAKE_CXX_COMPILER_ABI "ELF") -set(CMAKE_CXX_LIBRARY_ARCHITECTURE "") - -if(CMAKE_CXX_SIZEOF_DATA_PTR) - set(CMAKE_SIZEOF_VOID_P "${CMAKE_CXX_SIZEOF_DATA_PTR}") -endif() - -if(CMAKE_CXX_COMPILER_ABI) - set(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_CXX_COMPILER_ABI}") -endif() - -if(CMAKE_CXX_LIBRARY_ARCHITECTURE) - set(CMAKE_LIBRARY_ARCHITECTURE "") -endif() - -set(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX "") -if(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX) - set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_CXX_CL_SHOWINCLUDES_PREFIX}") -endif() - - - - -set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "c++;m;dl;c;dl") -set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/9.0.8/lib/linux/aarch64;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib/gcc/aarch64-linux-android/4.9.x;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/aarch64-linux-android/lib64;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/22;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/aarch64-linux-android/lib;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib") -set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "") diff --git a/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin b/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin deleted file mode 100755 index 1bce63e..0000000 Binary files a/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin and /dev/null differ diff --git a/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin b/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin deleted file mode 100755 index 1224768..0000000 Binary files a/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin and /dev/null differ diff --git a/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeSystem.cmake b/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeSystem.cmake deleted file mode 100644 index 835339c..0000000 --- a/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeSystem.cmake +++ /dev/null @@ -1,15 +0,0 @@ -set(CMAKE_HOST_SYSTEM "Linux-4.15.0-112-generic") -set(CMAKE_HOST_SYSTEM_NAME "Linux") -set(CMAKE_HOST_SYSTEM_VERSION "4.15.0-112-generic") -set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64") - -include("/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake") - -set(CMAKE_SYSTEM "Android-1") -set(CMAKE_SYSTEM_NAME "Android") -set(CMAKE_SYSTEM_VERSION "1") -set(CMAKE_SYSTEM_PROCESSOR "aarch64") - -set(CMAKE_CROSSCOMPILING "TRUE") - -set(CMAKE_SYSTEM_LOADED 1) diff --git a/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/TargetDirectories.txt b/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/TargetDirectories.txt index 3b55e5c..1058bf8 100644 --- a/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/TargetDirectories.txt +++ b/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/TargetDirectories.txt @@ -1,3 +1,3 @@ -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/rebuild_cache.dir -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/edit_cache.dir -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/djivideojni.dir +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/rebuild_cache.dir +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/edit_cache.dir +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/djivideojni.dir diff --git a/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o b/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o index d0c0b9f..871ad44 100644 Binary files a/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o and b/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o differ diff --git a/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/feature_tests.bin b/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/feature_tests.bin index cc1dfd6..4deb401 100755 Binary files a/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/feature_tests.bin and b/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/feature_tests.bin differ diff --git a/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/feature_tests.cxx b/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/feature_tests.cxx index a9b4791..703b335 100644 --- a/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/feature_tests.cxx +++ b/app/.cxx/cmake/debug/arm64-v8a/CMakeFiles/feature_tests.cxx @@ -1,35 +1,35 @@ const char features[] = {"\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_aggregate_nsdmi) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_aggregate_nsdmi) "1" #else "0" #endif "cxx_aggregate_default_initializers\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_alias_templates) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_alias_templates) "1" #else "0" #endif "cxx_alias_templates\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_alignas) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_alignas) "1" #else "0" #endif "cxx_alignas\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_alignas) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_alignas) "1" #else "0" #endif "cxx_alignof\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_attributes) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_attributes) "1" #else "0" @@ -43,35 +43,35 @@ #endif "cxx_attribute_deprecated\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_auto_type) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_auto_type) "1" #else "0" #endif "cxx_auto_type\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_binary_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_binary_literals) "1" #else "0" #endif "cxx_binary_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_constexpr) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_constexpr) "1" #else "0" #endif "cxx_constexpr\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_contextual_conversions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_contextual_conversions) "1" #else "0" #endif "cxx_contextual_conversions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_decltype) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_decltype) "1" #else "0" @@ -85,42 +85,42 @@ #endif "cxx_decltype_auto\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_decltype_incomplete_return_types) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_decltype_incomplete_return_types) "1" #else "0" #endif "cxx_decltype_incomplete_return_types\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_default_function_template_args) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_default_function_template_args) "1" #else "0" #endif "cxx_default_function_template_args\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_defaulted_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_defaulted_functions) "1" #else "0" #endif "cxx_defaulted_functions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_defaulted_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_defaulted_functions) "1" #else "0" #endif "cxx_defaulted_move_initializers\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_delegating_constructors) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_delegating_constructors) "1" #else "0" #endif "cxx_delegating_constructors\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_deleted_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_deleted_functions) "1" #else "0" @@ -134,49 +134,49 @@ #endif "cxx_digit_separators\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_enum_forward_declarations\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_explicit_conversions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_explicit_conversions) "1" #else "0" #endif "cxx_explicit_conversions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_extended_friend_declarations\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_extern_templates\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_override_control) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_override_control) "1" #else "0" #endif "cxx_final\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_func_identifier\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_generalized_initializers) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_generalized_initializers) "1" #else "0" @@ -190,210 +190,210 @@ #endif "cxx_generic_lambdas\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_inheriting_constructors) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_inheriting_constructors) "1" #else "0" #endif "cxx_inheriting_constructors\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_inline_namespaces\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_lambdas) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_lambdas) "1" #else "0" #endif "cxx_lambdas\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_init_captures) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_init_captures) "1" #else "0" #endif "cxx_lambda_init_captures\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_local_type_template_args) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_local_type_template_args) "1" #else "0" #endif "cxx_local_type_template_args\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_long_long_type\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_noexcept) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_noexcept) "1" #else "0" #endif "cxx_noexcept\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_nonstatic_member_init) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_nonstatic_member_init) "1" #else "0" #endif "cxx_nonstatic_member_init\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_nullptr) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_nullptr) "1" #else "0" #endif "cxx_nullptr\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_override_control) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_override_control) "1" #else "0" #endif "cxx_override\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_range_for) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_range_for) "1" #else "0" #endif "cxx_range_for\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_raw_string_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_raw_string_literals) "1" #else "0" #endif "cxx_raw_string_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_reference_qualified_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_reference_qualified_functions) "1" #else "0" #endif "cxx_reference_qualified_functions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_relaxed_constexpr) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_relaxed_constexpr) "1" #else "0" #endif "cxx_relaxed_constexpr\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_return_type_deduction) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_return_type_deduction) "1" #else "0" #endif "cxx_return_type_deduction\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_right_angle_brackets\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_rvalue_references) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_rvalue_references) "1" #else "0" #endif "cxx_rvalue_references\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_sizeof_member\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_static_assert) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_static_assert) "1" #else "0" #endif "cxx_static_assert\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_strong_enums) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_strong_enums) "1" #else "0" #endif "cxx_strong_enums\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 199711L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 199711L "1" #else "0" #endif "cxx_template_template_parameters\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_thread_local) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_thread_local) "1" #else "0" #endif "cxx_thread_local\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_trailing_return) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_trailing_return) "1" #else "0" #endif "cxx_trailing_return_types\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_unicode_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_unicode_literals) "1" #else "0" #endif "cxx_unicode_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_generalized_initializers) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_generalized_initializers) "1" #else "0" #endif "cxx_uniform_initialization\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_unrestricted_unions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_unrestricted_unions) "1" #else "0" #endif "cxx_unrestricted_unions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_user_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_user_literals) "1" #else "0" #endif "cxx_user_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_variable_templates) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_variable_templates) "1" #else "0" #endif "cxx_variable_templates\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_variadic_macros\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_variadic_templates) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_variadic_templates) "1" #else "0" diff --git a/app/.cxx/cmake/debug/arm64-v8a/android_gradle_build.json b/app/.cxx/cmake/debug/arm64-v8a/android_gradle_build.json index 18ccb40..9e3e5a1 100644 --- a/app/.cxx/cmake/debug/arm64-v8a/android_gradle_build.json +++ b/app/.cxx/cmake/debug/arm64-v8a/android_gradle_build.json @@ -1,65 +1,45 @@ - { - "buildFiles" : - [ - "/home/smartdrone/Working_Private/rosettadrone_work/app/CMakeLists.txt" - ], - "cFileExtensions" : [ "c" ], - "cleanCommands" : - [ - "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a --target clean" - ], - "libraries" : - { - "c++_shared-Debug-arm64-v8a" : - { - "abi" : "arm64-v8a", - "artifactName" : "c++_shared", - "buildType" : "debug", - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/arm64-v8a/libc++_shared.so.27", - "toolchain" : "6038786665986016389" - }, - "djivideojni-Debug-arm64-v8a" : - { - "abi" : "arm64-v8a", - "artifactName" : "djivideojni", - "buildCommand" : "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a --target djivideojni", - "buildType" : "debug", - "files" : - [ - - { - "flags" : " --target=aarch64-none-linux-android22 --gcc-toolchain=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64 --sysroot=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot -Ddjivideojni_EXPORTS -I../../../../src/main/cpp -I../../../../src/main/cpp/include -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/gstreamer-1.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/glib-2.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/lib/glib-2.0/include -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O0 -fno-limit-debug-info -fPIC -c ", - "src" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/dji_video_jni.c", - "workingDirectory" : "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a" - } - ], - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj/arm64-v8a/libdjivideojni.so", - "toolchain" : "6038786665986016389" - }, - "ffmpegjni-Debug-arm64-v8a" : - { - "abi" : "arm64-v8a", - "artifactName" : "ffmpegjni", - "buildType" : "debug", - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/arm64-v8a/libffmpeg.so", - "toolchain" : "6038786665986016389" - }, - "gstreamer_android-Debug-arm64-v8a" : - { - "abi" : "arm64-v8a", - "artifactName" : "gstreamer_android", - "buildType" : "debug", - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/arm64-v8a/libgstreamer_android.so", - "toolchain" : "6038786665986016389" - } - }, - "toolchains" : - { - "6038786665986016389" : - { - "cCompilerExecutable" : "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang", - "cppCompilerExecutable" : "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++" - } - } -} + "stringTable": { + "0": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a", + "1": "--target=aarch64-none-linux-android22 --gcc-toolchain=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64 --sysroot=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -Ddjivideojni_EXPORTS -I../../../../src/main/cpp -I../../../../src/main/cpp/include -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/gstreamer-1.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/glib-2.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/lib/glib-2.0/include -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -fno-addrsig -Wa,--noexecstack -Wformat -Werror=format-security -O0 -fno-limit-debug-info -fno-experimental-isel -fPIC" + }, + "buildFiles": [ + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake" + ], + "cleanCommands": [ + "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a\" clean" + ], + "buildTargetsCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a\" {LIST_OF_TARGETS_TO_BUILD}", + "libraries": { + "djivideojni-Debug-arm64-v8a": { + "buildCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a\" djivideojni", + "buildType": "debug", + "toolchain": "3669181217", + "abi": "arm64-v8a", + "artifactName": "djivideojni", + "files": [ + { + "src": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/src/main/cpp/dji_video_jni.c", + "flagsOrdinal": 1, + "workingDirectoryOrdinal": 0 + } + ], + "headers": [], + "output": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/debug/obj/arm64-v8a/libdjivideojni.so", + "runtimeFiles": [ + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/src/main/cpp/lib/arm64-v8a/libffmpeg.so" + ] + } + }, + "toolchains": { + "3669181217": { + "cCompilerExecutable": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang" + } + }, + "cFileExtensions": [ + "c" + ], + "cppFileExtensions": [] +} \ No newline at end of file diff --git a/app/.cxx/cmake/debug/arm64-v8a/android_gradle_build_djivideojni_arm64-v8a.command.txt b/app/.cxx/cmake/debug/arm64-v8a/android_gradle_build_djivideojni_arm64-v8a.command.txt index 93a8f21..b1b9d66 100644 --- a/app/.cxx/cmake/debug/arm64-v8a/android_gradle_build_djivideojni_arm64-v8a.command.txt +++ b/app/.cxx/cmake/debug/arm64-v8a/android_gradle_build_djivideojni_arm64-v8a.command.txt @@ -1,8 +1,7 @@ -Executable : /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake +Executable : /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja arguments : ---build -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a ---target +-C +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a djivideojni jvmArgs : diff --git a/app/.cxx/cmake/debug/arm64-v8a/android_gradle_build_djivideojni_arm64-v8a.stdout.txt b/app/.cxx/cmake/debug/arm64-v8a/android_gradle_build_djivideojni_arm64-v8a.stdout.txt index 964c94d..af69893 100644 --- a/app/.cxx/cmake/debug/arm64-v8a/android_gradle_build_djivideojni_arm64-v8a.stdout.txt +++ b/app/.cxx/cmake/debug/arm64-v8a/android_gradle_build_djivideojni_arm64-v8a.stdout.txt @@ -1 +1,2 @@ +ninja: Entering directory `/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a' ninja: no work to do. diff --git a/app/.cxx/cmake/debug/arm64-v8a/android_gradle_build_mini.json b/app/.cxx/cmake/debug/arm64-v8a/android_gradle_build_mini.json index a5d4050..b9da9a1 100644 --- a/app/.cxx/cmake/debug/arm64-v8a/android_gradle_build_mini.json +++ b/app/.cxx/cmake/debug/arm64-v8a/android_gradle_build_mini.json @@ -1,31 +1,22 @@ { "buildFiles": [ - "/home/smartdrone/Working_Private/rosettadrone_work/app/CMakeLists.txt" + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake" ], "cleanCommands": [ - "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a --target clean" + "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a\" clean" ], + "buildTargetsCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a\" {LIST_OF_TARGETS_TO_BUILD}", "libraries": { "djivideojni-Debug-arm64-v8a": { "artifactName": "djivideojni", - "buildCommand": "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a --target djivideojni", + "buildCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a\" djivideojni", "abi": "arm64-v8a", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj/arm64-v8a/libdjivideojni.so" - }, - "ffmpegjni-Debug-arm64-v8a": { - "artifactName": "ffmpegjni", - "abi": "arm64-v8a", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/arm64-v8a/libffmpeg.so" - }, - "gstreamer_android-Debug-arm64-v8a": { - "artifactName": "gstreamer_android", - "abi": "arm64-v8a", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/arm64-v8a/libgstreamer_android.so" - }, - "c++_shared-Debug-arm64-v8a": { - "artifactName": "c++_shared", - "abi": "arm64-v8a", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/arm64-v8a/libc++_shared.so.27" + "output": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/debug/obj/arm64-v8a/libdjivideojni.so", + "runtimeFiles": [ + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/src/main/cpp/lib/arm64-v8a/libffmpeg.so" + ] } } } \ No newline at end of file diff --git a/app/.cxx/cmake/debug/arm64-v8a/android_gradle_generate_cmake_ninja_json_arm64-v8a.command.txt b/app/.cxx/cmake/debug/arm64-v8a/android_gradle_generate_cmake_ninja_json_arm64-v8a.command.txt deleted file mode 100644 index 5a1c7cd..0000000 --- a/app/.cxx/cmake/debug/arm64-v8a/android_gradle_generate_cmake_ninja_json_arm64-v8a.command.txt +++ /dev/null @@ -1,14 +0,0 @@ -Executable : /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -arguments : --H/home/smartdrone/Working_Private/rosettadrone_work/app --B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a --DANDROID_ABI=arm64-v8a --DANDROID_PLATFORM=android-22 --DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj/arm64-v8a --DCMAKE_BUILD_TYPE=Debug --DANDROID_NDK=/home/smartdrone/Android/Sdk/ndk/21.3.6528147 --DCMAKE_TOOLCHAIN_FILE=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake --DCMAKE_MAKE_PROGRAM=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja --GAndroid Gradle - Ninja -jvmArgs : - diff --git a/app/.cxx/cmake/debug/arm64-v8a/android_gradle_generate_cmake_ninja_json_arm64-v8a.stderr.txt b/app/.cxx/cmake/debug/arm64-v8a/android_gradle_generate_cmake_ninja_json_arm64-v8a.stderr.txt deleted file mode 100644 index e69de29..0000000 diff --git a/app/.cxx/cmake/debug/arm64-v8a/android_gradle_generate_cmake_ninja_json_arm64-v8a.stdout.txt b/app/.cxx/cmake/debug/arm64-v8a/android_gradle_generate_cmake_ninja_json_arm64-v8a.stdout.txt deleted file mode 100644 index d0546a7..0000000 --- a/app/.cxx/cmake/debug/arm64-v8a/android_gradle_generate_cmake_ninja_json_arm64-v8a.stdout.txt +++ /dev/null @@ -1,15 +0,0 @@ --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -- works --- Detecting C compiler ABI info --- Detecting C compiler ABI info - done --- Detecting C compile features --- Detecting C compile features - done --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -- works --- Detecting CXX compiler ABI info --- Detecting CXX compiler ABI info - done --- Detecting CXX compile features --- Detecting CXX compile features - done --- Configuring done --- Generating done --- Build files have been written to: /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a diff --git a/app/.cxx/cmake/debug/arm64-v8a/build.ninja b/app/.cxx/cmake/debug/arm64-v8a/build.ninja index 64ae3aa..c35d053 100644 --- a/app/.cxx/cmake/debug/arm64-v8a/build.ninja +++ b/app/.cxx/cmake/debug/arm64-v8a/build.ninja @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Ninja" Generator, CMake Version 3.6 +# Generated by "Ninja" Generator, CMake Version 3.10 # This file contains all the build statements describing the # compilation DAG. @@ -34,7 +34,7 @@ include rules.ninja # Utility command for rebuild_cache build CMakeFiles/rebuild_cache.util: CUSTOM_COMMAND - COMMAND = cd /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a && /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -H/home/smartdrone/Working_Private/rosettadrone_work/app -B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a + COMMAND = cd /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a && /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake -H/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app -B/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a DESC = Running CMake to regenerate build system... pool = console restat = 1 @@ -44,19 +44,23 @@ build rebuild_cache: phony CMakeFiles/rebuild_cache.util # Utility command for edit_cache build CMakeFiles/edit_cache.util: CUSTOM_COMMAND - COMMAND = cd /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a && /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. + COMMAND = cd /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a && /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. DESC = No interactive CMake dialog available... restat = 1 build edit_cache: phony CMakeFiles/edit_cache.util # ============================================================================= # Object build statements for SHARED_LIBRARY target djivideojni -build CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o: C_COMPILER__djivideojni ../../../../src/main/cpp/dji_video_jni.c + +############################################# +# Order-only phony target for djivideojni + +build cmake_object_order_depends_target_djivideojni: phony +build CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o: C_COMPILER__djivideojni ../../../../src/main/cpp/dji_video_jni.c || cmake_object_order_depends_target_djivideojni DEFINES = -Ddjivideojni_EXPORTS DEP_FILE = CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o.d - FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O0 -fno-limit-debug-info -fPIC + FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -fno-addrsig -Wa,--noexecstack -Wformat -Werror=format-security -O0 -fno-limit-debug-info -fno-experimental-isel -fPIC INCLUDES = -I../../../../src/main/cpp -I../../../../src/main/cpp/include -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/gstreamer-1.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/glib-2.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/lib/glib-2.0/include - IN_ABS = /home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/dji_video_jni.c OBJECT_DIR = CMakeFiles/djivideojni.dir OBJECT_FILE_DIR = CMakeFiles/djivideojni.dir/src/main/cpp @@ -67,10 +71,10 @@ build CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o: C_COMPILER__dji ############################################# # Link the shared library ../../../../build/intermediates/cmake/debug/obj/arm64-v8a/libdjivideojni.so -build ../../../../build/intermediates/cmake/debug/obj/arm64-v8a/libdjivideojni.so: C_SHARED_LIBRARY_LINKER__djivideojni CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o | ../../../../src/main/cpp/lib/arm64-v8a/libffmpeg.so /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/22/liblog.so - LANGUAGE_COMPILE_FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O0 -fno-limit-debug-info - LINK_FLAGS = -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libgcc_real.a -Wl,--exclude-libs,libatomic.a -static-libstdc++ -Wl,--build-id -Wl,--fatal-warnings -Wl,--no-undefined -Qunused-arguments - LINK_LIBRARIES = ../../../../src/main/cpp/lib/arm64-v8a/libffmpeg.so /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/22/liblog.so -latomic -lm +build ../../../../build/intermediates/cmake/debug/obj/arm64-v8a/libdjivideojni.so: C_SHARED_LIBRARY_LINKER__djivideojni CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o | ../../../../src/main/cpp/lib/arm64-v8a/libffmpeg.so /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/22/liblog.so + LANGUAGE_COMPILE_FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -fno-addrsig -Wa,--noexecstack -Wformat -Werror=format-security -O0 -fno-limit-debug-info -fno-experimental-isel + LINK_FLAGS = -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -static-libstdc++ -Wl,--build-id -Wl,--warn-shared-textrel -Wl,--fatal-warnings -Wl,--no-undefined -Qunused-arguments -Wl,-z,noexecstack + LINK_LIBRARIES = ../../../../src/main/cpp/lib/arm64-v8a/libffmpeg.so -llog -latomic -lm OBJECT_DIR = CMakeFiles/djivideojni.dir POST_BUILD = : PRE_LINK = : @@ -104,13 +108,13 @@ default all ############################################# # Re-run CMake if any of its inputs changed. -build build.ninja: RERUN_CMAKE | ../../../../CMakeLists.txt /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompilerABI.c /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompilerABI.cpp /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCommonLanguageInclude.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompileFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompilerABI.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeFindBinUtils.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeGenericSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeLanguageInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeParseImplicitLinkInfo.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystem.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInitialize.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCompilerCommon.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/GNU.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Internal/FeatureTesting.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Android.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Linux.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/UnixPaths.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/platforms.cmake CMakeCache.txt CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx +build build.ninja: RERUN_CMAKE | ../../../../CMakeLists.txt /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompilerABI.c /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompilerABI.cpp /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCommonLanguageInclude.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompileFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompilerABI.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeFindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeGenericSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeLanguageInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeParseImplicitLinkInfo.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystem.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInitialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCompilerCommon.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/CMakeCommonCompilerMacros.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-FindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/GNU.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Internal/FeatureTesting.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Initialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android/Determine-Compiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Linux.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/UnixPaths.cmake CMakeCache.txt CMakeFiles/3.10.2/CMakeCCompiler.cmake CMakeFiles/3.10.2/CMakeCXXCompiler.cmake CMakeFiles/3.10.2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx pool = console ############################################# # A missing CMake input file is not an error. -build ../../../../CMakeLists.txt /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompilerABI.c /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompilerABI.cpp /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCommonLanguageInclude.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompileFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompilerABI.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeFindBinUtils.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeGenericSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeLanguageInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeParseImplicitLinkInfo.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystem.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInitialize.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCompilerCommon.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/GNU.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Internal/FeatureTesting.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Android.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Linux.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/UnixPaths.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/platforms.cmake CMakeCache.txt CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx: phony +build ../../../../CMakeLists.txt /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompilerABI.c /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompilerABI.cpp /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCommonLanguageInclude.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompileFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompilerABI.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeFindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeGenericSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeLanguageInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeParseImplicitLinkInfo.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystem.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInitialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCompilerCommon.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/CMakeCommonCompilerMacros.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-FindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/GNU.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Internal/FeatureTesting.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Initialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android/Determine-Compiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Linux.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/UnixPaths.cmake CMakeCache.txt CMakeFiles/3.10.2/CMakeCCompiler.cmake CMakeFiles/3.10.2/CMakeCXXCompiler.cmake CMakeFiles/3.10.2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx: phony ############################################# # Clean all the built files. diff --git a/app/.cxx/cmake/debug/arm64-v8a/build_command.txt b/app/.cxx/cmake/debug/arm64-v8a/build_command.txt index 5a1c7cd..87c2cf5 100644 --- a/app/.cxx/cmake/debug/arm64-v8a/build_command.txt +++ b/app/.cxx/cmake/debug/arm64-v8a/build_command.txt @@ -1,14 +1,21 @@ -Executable : /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake + Executable : /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake arguments : --H/home/smartdrone/Working_Private/rosettadrone_work/app --B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a --DANDROID_ABI=arm64-v8a --DANDROID_PLATFORM=android-22 --DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj/arm64-v8a +-H/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app +-DCMAKE_FIND_ROOT_PATH=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/prefab/arm64-v8a/prefab -DCMAKE_BUILD_TYPE=Debug --DANDROID_NDK=/home/smartdrone/Android/Sdk/ndk/21.3.6528147 --DCMAKE_TOOLCHAIN_FILE=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake --DCMAKE_MAKE_PROGRAM=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja --GAndroid Gradle - Ninja +-DCMAKE_TOOLCHAIN_FILE=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake +-DANDROID_ABI=arm64-v8a +-DANDROID_NDK=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 +-DANDROID_PLATFORM=android-22 +-DCMAKE_ANDROID_ARCH_ABI=arm64-v8a +-DCMAKE_ANDROID_NDK=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 +-DCMAKE_EXPORT_COMPILE_COMMANDS=ON +-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/debug/obj/arm64-v8a +-DCMAKE_MAKE_PROGRAM=/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja +-DCMAKE_SYSTEM_NAME=Android +-DCMAKE_SYSTEM_VERSION=22 +-B/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a +-GNinja jvmArgs : +Build command args: diff --git a/app/.cxx/cmake/debug/arm64-v8a/build_model.json b/app/.cxx/cmake/debug/arm64-v8a/build_model.json index 946a40a..9cc0cfb 100644 --- a/app/.cxx/cmake/debug/arm64-v8a/build_model.json +++ b/app/.cxx/cmake/debug/arm64-v8a/build_model.json @@ -1,69 +1,202 @@ { - "variant": { - "module": { - "rootBuildGradleFolder": "/home/smartdrone/Working_Private/rosettadrone_work", - "sdkFolder": "/home/smartdrone/Android/Sdk", - "isNativeCompilerSettingsCacheEnabled": false, - "isBuildOnlyTargetAbiEnabled": true, - "ideBuildTargetAbi": "arm64-v8a,armeabi-v7a,armeabi", - "splitsAbiFilterSet": [], - "intermediatesFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates", - "gradleModulePathName": ":app", - "moduleRootFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app", - "makeFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/CMakeLists.txt", - "buildSystem": "CMAKE", - "compilerSettingsCacheFolder": "/home/smartdrone/Working_Private/rosettadrone_work/.cxx", - "cxxFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx", - "ndkFolder": "/home/smartdrone/Android/Sdk/ndk/21.3.6528147", - "ndkVersion": "21.3.6528147", - "ndkSupportedAbiList": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" + "abi": "ARM64_V8A", + "abiPlatformVersion": 22, + "buildSettings": { + "environmentVariables": [] + }, + "cmake": { + "cmakeArtifactsBaseFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a", + "cmakeServerLogFile": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a/cmake_server_log.txt", + "cmakeWrappingBaseFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cxx/debug/arm64-v8a", + "effectiveConfiguration": { + "name": "traditional-android-studio-cmake-environment", + "description": "Composite reified CMakeSettings configuration", + "generator": "Ninja", + "inheritEnvironments": [ + "ndk" ], + "buildRoot": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a", + "cmakeToolchain": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "cmakeExecutable": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake", + "variables": [ + { + "name": "CMAKE_FIND_ROOT_PATH", + "value": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/prefab/arm64-v8a/prefab" + }, + { + "name": "CMAKE_BUILD_TYPE", + "value": "Debug" + }, + { + "name": "CMAKE_TOOLCHAIN_FILE", + "value": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake" + }, + { + "name": "ANDROID_ABI", + "value": "arm64-v8a" + }, + { + "name": "ANDROID_NDK", + "value": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944" + }, + { + "name": "ANDROID_PLATFORM", + "value": "android-22" + }, + { + "name": "CMAKE_ANDROID_ARCH_ABI", + "value": "arm64-v8a" + }, + { + "name": "CMAKE_ANDROID_NDK", + "value": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944" + }, + { + "name": "CMAKE_EXPORT_COMPILE_COMMANDS", + "value": "ON" + }, + { + "name": "CMAKE_LIBRARY_OUTPUT_DIRECTORY", + "value": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/debug/obj/arm64-v8a" + }, + { + "name": "CMAKE_MAKE_PROGRAM", + "value": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja" + }, + { + "name": "CMAKE_SYSTEM_NAME", + "value": "Android" + }, + { + "name": "CMAKE_SYSTEM_VERSION", + "value": "22" + } + ] + } + }, + "cxxBuildFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a", + "info": { + "abi": "ARM64_V8A", + "bitness": 64, + "deprecated": false, + "default": true + }, + "originalCxxBuildFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a", + "variant": { + "buildSystemArgumentList": [], + "buildTargetSet": [], + "implicitBuildTargetSet": [], + "cFlagsList": [], + "cmakeSettingsConfiguration": "android-gradle-plugin-predetermined-name", + "cppFlagsList": [], + "isDebuggableEnabled": true, + "module": { + "buildSystem": "CMAKE", + "cmake": { + "cmakeExe": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake", + "minimumCmakeVersion": "3.10.2", + "ninjaExe": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja" + }, + "cmakeToolchainFile": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "cxxFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx", + "gradleModulePathName": ":app", + "intermediatesFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates", + "makeFile": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "moduleBuildFile": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build.gradle", + "moduleRootFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app", "ndkDefaultAbiList": [ "ARMEABI_V7A", "ARM64_V8A", "X86", "X86_64" ], - "cmakeToolchainFile": "." + "ndkFolder": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944", + "ndkMetaAbiList": [ + { + "abi": "ARMEABI_V7A", + "bitness": 32, + "deprecated": false, + "default": true + }, + { + "abi": "ARM64_V8A", + "bitness": 64, + "deprecated": false, + "default": true + }, + { + "abi": "X86", + "bitness": 32, + "deprecated": false, + "default": true + }, + { + "abi": "X86_64", + "bitness": 64, + "deprecated": false, + "default": true + } + ], + "ndkMetaPlatforms": { + "min": 16, + "max": 29, + "aliases": { + "20": 19, + "25": 24, + "J": 16, + "J-MR1": 17, + "J-MR2": 18, + "K": 19, + "L": 21, + "L-MR1": 22, + "M": 23, + "N": 24, + "N-MR1": 24, + "O": 26, + "O-MR1": 27, + "P": 28, + "Q": 29 + } + }, + "ndkSupportedAbiList": [ + "ARMEABI_V7A", + "ARM64_V8A", + "X86", + "X86_64" + ], + "ndkDefaultStl": "LIBCXX_STATIC", + "ndkVersion": "20.1.5948944", + "project": { + "compilerSettingsCacheFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/.cxx", + "cxxFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/.cxx", + "ideBuildTargetAbi": "arm64-v8a,armeabi-v7a,armeabi", + "isBuildOnlyTargetAbiEnabled": true, + "isCmakeBuildCohabitationEnabled": false, + "isNativeCompilerSettingsCacheEnabled": false, + "rootBuildGradleFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work", + "sdkFolder": "/Users/teni/Library/Android/sdk", + "isPrefabEnabled": false + }, + "splitsAbiFilterSet": [], + "stlSharedObjectMap": { + "LIBCXX_SHARED": { + "ARMEABI_V7A": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi/libc++_shared.so", + "ARM64_V8A": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so", + "X86": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/i686-linux-android/libc++_shared.so", + "X86_64": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/x86_64-linux-android/libc++_shared.so" + }, + "LIBCXX_STATIC": {}, + "NONE": {}, + "SYSTEM": {} + } }, - "buildSystemArgumentList": [], - "cFlagList": [], - "cppFlagsList": [], + "objFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/debug/obj", "variantName": "debug", - "soFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/lib", - "objFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj", - "jsonFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug", - "gradleBuildOutputFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug", - "isDebuggableEnabled": true, "validAbiList": [ - "ARM64_V8A", - "ARMEABI_V7A" + "ARM64_V8A" ], - "buildTargetSet": [] + "prefabDirectory": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/prefab", + "prefabPackageDirectoryList": [] }, - "abi": "ARM64_V8A", - "abiPlatformVersion": 22, - "cxxBuildFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a", - "jsonFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a/android_gradle_build.json", - "gradleBuildOutputFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/arm64-v8a", - "objFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj/arm64-v8a", - "buildCommandFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a/build_command.txt", - "buildOutputFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a/build_output.txt", - "modelOutputFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a/build_model.json", - "cmake": { - "cmakeListsWrapperFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/arm64-v8a/CMakeLists.txt", - "toolchainWrapperFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/arm64-v8a/android_gradle_build.toolchain.cmake", - "buildGenerationStateFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/arm64-v8a/build_generation_state.json", - "cacheKeyFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/arm64-v8a/compiler_cache_key.json", - "compilerCacheUseFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/arm64-v8a/compiler_cache_use.json", - "compilerCacheWriteFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/arm64-v8a/compiler_cache_write.json", - "toolchainSettingsFromCacheFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/arm64-v8a/compiler_settings_cache.cmake", - "cmakeWrappingBaseFolder": "." - }, - "jsonGenerationLoggingRecordFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a/json_generation_record.json", - "compileCommandsJsonFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a/compile_commands.json" + "prefabFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/prefab/arm64-v8a" } \ No newline at end of file diff --git a/app/.cxx/cmake/debug/arm64-v8a/build_output.txt b/app/.cxx/cmake/debug/arm64-v8a/build_output.txt index 88af36f..bc40114 100644 --- a/app/.cxx/cmake/debug/arm64-v8a/build_output.txt +++ b/app/.cxx/cmake/debug/arm64-v8a/build_output.txt @@ -1,15 +1,13 @@ --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -- works --- Detecting C compiler ABI info --- Detecting C compiler ABI info - done --- Detecting C compile features --- Detecting C compile features - done --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -- works --- Detecting CXX compiler ABI info --- Detecting CXX compiler ABI info - done --- Detecting CXX compile features --- Detecting CXX compile features - done --- Configuring done --- Generating done --- Build files have been written to: /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a \ No newline at end of file +Check for working C compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang +Check for working C compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang -- works +Detecting C compiler ABI info +Detecting C compiler ABI info - done +Detecting C compile features +Detecting C compile features - done +Check for working CXX compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ +Check for working CXX compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ -- works +Detecting CXX compiler ABI info +Detecting CXX compiler ABI info - done +Detecting CXX compile features +Detecting CXX compile features - done +Configuring done \ No newline at end of file diff --git a/app/.cxx/cmake/debug/arm64-v8a/cmake_install.cmake b/app/.cxx/cmake/debug/arm64-v8a/cmake_install.cmake index a46847e..4518d65 100644 --- a/app/.cxx/cmake/debug/arm64-v8a/cmake_install.cmake +++ b/app/.cxx/cmake/debug/arm64-v8a/cmake_install.cmake @@ -1,4 +1,4 @@ -# Install script for directory: /home/smartdrone/Working_Private/rosettadrone_work/app +# Install script for directory: /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app # Set the install prefix if(NOT DEFINED CMAKE_INSTALL_PREFIX) @@ -29,7 +29,12 @@ endif() # Install shared libraries without execute permission? if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) - set(CMAKE_INSTALL_SO_NO_EXE "1") + set(CMAKE_INSTALL_SO_NO_EXE "0") +endif() + +# Is this installation the result of a crosscompile? +if(NOT DEFINED CMAKE_CROSSCOMPILING) + set(CMAKE_CROSSCOMPILING "TRUE") endif() if(CMAKE_INSTALL_COMPONENT) @@ -40,5 +45,5 @@ endif() string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT "${CMAKE_INSTALL_MANIFEST_FILES}") -file(WRITE "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a/${CMAKE_INSTALL_MANIFEST}" +file(WRITE "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a/${CMAKE_INSTALL_MANIFEST}" "${CMAKE_INSTALL_MANIFEST_CONTENT}") diff --git a/app/.cxx/cmake/debug/arm64-v8a/json_generation_record.json b/app/.cxx/cmake/debug/arm64-v8a/json_generation_record.json index dee441b..fd72d1e 100644 --- a/app/.cxx/cmake/debug/arm64-v8a/json_generation_record.json +++ b/app/.cxx/cmake/debug/arm64-v8a/json_generation_record.json @@ -1,30 +1,44 @@ [ { "level": "INFO", - "message": "Start JSON generation. Platform version: 22 min SDK version: arm64-v8a" + "message": "Start JSON generation. Platform version: 22 min SDK version: arm64-v8a", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|arm64-v8a" }, { "level": "INFO", - "message": "No CMake version was specified in build.gradle. Choosing a suitable version." + "message": "No CMake version was specified in build.gradle. Using default version 3.10.2.", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|arm64-v8a" }, { "level": "INFO", - "message": "Trying to locate CMake in local SDK repository." + "message": "Trying to locate CMake in local SDK repository.", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|arm64-v8a" }, { "level": "INFO", - "message": "CMake \u00273.10.2\u0027 found in SDK did not match requested version \u00273.6.0\u0027." + "message": "- CMake found in SDK at \u0027/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404\u0027 had version \u00273.10.2\u0027", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|arm64-v8a" }, { "level": "INFO", - "message": "- CMake found in SDK at \u0027/home/smartdrone/Android/Sdk/cmake/3.6.4111459\u0027 had version \u00273.6.0\u0027" + "message": "CMake \u00273.6.0\u0027 found in SDK did not match requested version \u00273.10.2\u0027.", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|arm64-v8a" }, { "level": "INFO", - "message": "JSON \u0027/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a/android_gradle_build.json\u0027 was up-to-date" + "message": "JSON \u0027/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a/android_gradle_build.json\u0027 was up-to-date", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|arm64-v8a" }, { "level": "INFO", - "message": "JSON generation completed without problems" + "message": "JSON generation completed without problems", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|arm64-v8a" } ] \ No newline at end of file diff --git a/app/.cxx/cmake/debug/arm64-v8a/rules.ninja b/app/.cxx/cmake/debug/arm64-v8a/rules.ninja index c9f0107..3d8029a 100644 --- a/app/.cxx/cmake/debug/arm64-v8a/rules.ninja +++ b/app/.cxx/cmake/debug/arm64-v8a/rules.ninja @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Ninja" Generator, CMake Version 3.6 +# Generated by "Ninja" Generator, CMake Version 3.10 # This file contains all the rules used to get the outputs files # built from the input files. @@ -25,7 +25,7 @@ rule CUSTOM_COMMAND rule C_COMPILER__djivideojni depfile = $DEP_FILE deps = gcc - command = /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=aarch64-none-linux-android22 --gcc-toolchain=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64 --sysroot=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot $DEFINES $INCLUDES $FLAGS -MD -MT $out -MF $DEP_FILE -o $out -c $IN_ABS + command = /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang --target=aarch64-none-linux-android22 --gcc-toolchain=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64 --sysroot=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot $DEFINES $INCLUDES $FLAGS -MD -MT $out -MF $DEP_FILE -o $out -c $in description = Building C object $out @@ -33,7 +33,7 @@ rule C_COMPILER__djivideojni # Rule for linking C shared library. rule C_SHARED_LIBRARY_LINKER__djivideojni - command = $PRE_LINK && /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=aarch64-none-linux-android22 --gcc-toolchain=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64 --sysroot=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot -fPIC $LANGUAGE_COMPILE_FLAGS $ARCH_FLAGS $LINK_FLAGS -shared $SONAME_FLAG$SONAME -o $TARGET_FILE $in $LINK_PATH $LINK_LIBRARIES && $POST_BUILD + command = $PRE_LINK && /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang --target=aarch64-none-linux-android22 --gcc-toolchain=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64 --sysroot=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -fPIC $LANGUAGE_COMPILE_FLAGS $ARCH_FLAGS $LINK_FLAGS -shared $SONAME_FLAG$SONAME -o $TARGET_FILE $in $LINK_PATH $LINK_LIBRARIES && $POST_BUILD description = Linking C shared library $TARGET_FILE restat = $RESTAT @@ -42,7 +42,7 @@ rule C_SHARED_LIBRARY_LINKER__djivideojni # Rule for re-running cmake. rule RERUN_CMAKE - command = /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -H/home/smartdrone/Working_Private/rosettadrone_work/app -B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a + command = /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake -H/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app -B/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/arm64-v8a description = Re-running CMake... generator = 1 @@ -51,7 +51,7 @@ rule RERUN_CMAKE # Rule for cleaning all built files. rule CLEAN - command = /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja -t clean + command = /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -t clean description = Cleaning all built files... @@ -59,6 +59,6 @@ rule CLEAN # Rule for printing all primary targets available. rule HELP - command = /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja -t targets + command = /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -t targets description = All primary targets available: diff --git a/app/.cxx/cmake/debug/armeabi-v7a/.ninja_deps b/app/.cxx/cmake/debug/armeabi-v7a/.ninja_deps index 2c6f1d0..d521fd6 100644 Binary files a/app/.cxx/cmake/debug/armeabi-v7a/.ninja_deps and b/app/.cxx/cmake/debug/armeabi-v7a/.ninja_deps differ diff --git a/app/.cxx/cmake/debug/armeabi-v7a/.ninja_log b/app/.cxx/cmake/debug/armeabi-v7a/.ninja_log index 06d9a79..ae7a21c 100644 --- a/app/.cxx/cmake/debug/armeabi-v7a/.ninja_log +++ b/app/.cxx/cmake/debug/armeabi-v7a/.ninja_log @@ -1,15 +1,3 @@ # ninja log v5 -0 70 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o 317df2ebc289d878 -71 82 0 ../../../../build/intermediates/cmake/debug/obj/armeabi-v7a/libdjivideojni.so 29f7238600cc03c -0 60 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o 317df2ebc289d878 -60 72 0 ../../../../build/intermediates/cmake/debug/obj/armeabi-v7a/libdjivideojni.so 29f7238600cc03c -0 141 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o 317df2ebc289d878 -141 166 0 ../../../../build/intermediates/cmake/debug/obj/armeabi-v7a/libdjivideojni.so 29f7238600cc03c -1 62 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o 317df2ebc289d878 -62 72 0 ../../../../build/intermediates/cmake/debug/obj/armeabi-v7a/libdjivideojni.so 29f7238600cc03c -1 89 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o 317df2ebc289d878 -89 100 0 ../../../../build/intermediates/cmake/debug/obj/armeabi-v7a/libdjivideojni.so 29f7238600cc03c -1 140 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o 317df2ebc289d878 -140 168 0 ../../../../build/intermediates/cmake/debug/obj/armeabi-v7a/libdjivideojni.so 29f7238600cc03c -1 81 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o 317df2ebc289d878 -81 91 0 ../../../../build/intermediates/cmake/debug/obj/armeabi-v7a/libdjivideojni.so 29f7238600cc03c +1 217 1607019444 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o e4ac89be910316ea +218 274 1607019444 ../../../../build/intermediates/cmake/debug/obj/armeabi-v7a/libdjivideojni.so cba14830643b8e74 diff --git a/app/.cxx/cmake/debug/armeabi-v7a/CMakeCache.txt b/app/.cxx/cmake/debug/armeabi-v7a/CMakeCache.txt index 002830e..45bf7c7 100644 --- a/app/.cxx/cmake/debug/armeabi-v7a/CMakeCache.txt +++ b/app/.cxx/cmake/debug/armeabi-v7a/CMakeCache.txt @@ -1,6 +1,6 @@ # This is the CMakeCache file. -# For build in directory: /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a -# It was generated by CMake: /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake +# For build in directory: /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a +# It was generated by CMake: /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. # If you do want to change a value, simply edit, save, and exit the editor. @@ -18,13 +18,19 @@ ANDROID_ABI:UNINITIALIZED=armeabi-v7a //No help, variable specified on the command line. -ANDROID_NDK:UNINITIALIZED=/home/smartdrone/Android/Sdk/ndk/21.3.6528147 +ANDROID_NDK:UNINITIALIZED=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 //No help, variable specified on the command line. ANDROID_PLATFORM:UNINITIALIZED=android-22 +//No help, variable specified on the command line. +CMAKE_ANDROID_ARCH_ABI:UNINITIALIZED=armeabi-v7a + +//No help, variable specified on the command line. +CMAKE_ANDROID_NDK:UNINITIALIZED=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 + //Archiver -CMAKE_AR:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ar +CMAKE_AR:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-ar //Flags used by the compiler during all build types. CMAKE_ASM_FLAGS:STRING= @@ -39,6 +45,12 @@ CMAKE_ASM_FLAGS_RELEASE:STRING= // CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel. CMAKE_BUILD_TYPE:STRING=Debug +//LLVM archiver +CMAKE_CXX_COMPILER_AR:FILEPATH=CMAKE_CXX_COMPILER_AR-NOTFOUND + +//Generate index for LLVM archive +CMAKE_CXX_COMPILER_RANLIB:FILEPATH=CMAKE_CXX_COMPILER_RANLIB-NOTFOUND + //Flags used by the compiler during all build types. CMAKE_CXX_FLAGS:STRING= @@ -58,6 +70,12 @@ CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG //Libraries linked by default with all C++ applications. CMAKE_CXX_STANDARD_LIBRARIES:STRING=-latomic -lm +//LLVM archiver +CMAKE_C_COMPILER_AR:FILEPATH=CMAKE_C_COMPILER_AR-NOTFOUND + +//Generate index for LLVM archive +CMAKE_C_COMPILER_RANLIB:FILEPATH=CMAKE_C_COMPILER_RANLIB-NOTFOUND + //Flags used by the compiler during all build types. CMAKE_C_FLAGS:STRING= @@ -93,19 +111,22 @@ CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING= CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Enable/Disable output of compile commands during generation. -CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF +CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON + +//No help, variable specified on the command line. +CMAKE_FIND_ROOT_PATH:UNINITIALIZED=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/prefab/armeabi-v7a/prefab //Install path prefix, prepended onto install directories. CMAKE_INSTALL_PREFIX:PATH=/usr/local //No help, variable specified on the command line. -CMAKE_LIBRARY_OUTPUT_DIRECTORY:UNINITIALIZED=/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj/armeabi-v7a +CMAKE_LIBRARY_OUTPUT_DIRECTORY:UNINITIALIZED=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/debug/obj/armeabi-v7a //Path to a program. -CMAKE_LINKER:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ld +CMAKE_LINKER:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-ld //No help, variable specified on the command line. -CMAKE_MAKE_PROGRAM:UNINITIALIZED=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja +CMAKE_MAKE_PROGRAM:UNINITIALIZED=/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja //Flags used by the linker during the creation of modules. CMAKE_MODULE_LINKER_FLAGS:STRING= @@ -123,19 +144,19 @@ CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Path to a program. -CMAKE_NM:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-nm +CMAKE_NM:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-nm //Path to a program. -CMAKE_OBJCOPY:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-objcopy +CMAKE_OBJCOPY:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-objcopy //Path to a program. -CMAKE_OBJDUMP:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-objdump +CMAKE_OBJDUMP:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-objdump //Value Computed by CMake CMAKE_PROJECT_NAME:STATIC=Project //Ranlib -CMAKE_RANLIB:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ranlib +CMAKE_RANLIB:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-ranlib //Flags used by the linker during the creation of dll's. CMAKE_SHARED_LINKER_FLAGS:STRING= @@ -175,10 +196,16 @@ CMAKE_STATIC_LINKER_FLAGS_RELEASE:STRING= CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Path to a program. -CMAKE_STRIP:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-strip +CMAKE_STRIP:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-strip + +//No help, variable specified on the command line. +CMAKE_SYSTEM_NAME:UNINITIALIZED=Android + +//No help, variable specified on the command line. +CMAKE_SYSTEM_VERSION:UNINITIALIZED=22 //The CMake toolchain file -CMAKE_TOOLCHAIN_FILE:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake +CMAKE_TOOLCHAIN_FILE:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake //If this value is on, makefiles will be generated without the // .SILENT directive, and all commands will be echoed to the console @@ -187,16 +214,16 @@ CMAKE_TOOLCHAIN_FILE:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/buil CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE //Value Computed by CMake -Project_BINARY_DIR:STATIC=/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a +Project_BINARY_DIR:STATIC=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a //Value Computed by CMake -Project_SOURCE_DIR:STATIC=/home/smartdrone/Working_Private/rosettadrone_work/app +Project_SOURCE_DIR:STATIC=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app //Dependencies for the target -djivideojni_LIB_DEPENDS:STATIC=general;ffmpegjni;general;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/22/liblog.so; +djivideojni_LIB_DEPENDS:STATIC=general;ffmpegjni;general;/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi/22/liblog.so; //Path to a library. -log-lib:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/22/liblog.so +log-lib:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi/22/liblog.so ######################## @@ -206,19 +233,23 @@ log-lib:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/p //ADVANCED property for variable: CMAKE_AR CMAKE_AR-ADVANCED:INTERNAL=1 //This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a +CMAKE_CACHEFILE_DIR:INTERNAL=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3 //Minor version of cmake used to create the current loaded cache -CMAKE_CACHE_MINOR_VERSION:INTERNAL=6 +CMAKE_CACHE_MINOR_VERSION:INTERNAL=10 //Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=0 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=2 //Path to CMake executable. -CMAKE_COMMAND:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake +CMAKE_COMMAND:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake //Path to cpack program executable. -CMAKE_CPACK_COMMAND:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cpack +CMAKE_CPACK_COMMAND:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cpack //Path to ctest program executable. -CMAKE_CTEST_COMMAND:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ctest +CMAKE_CTEST_COMMAND:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/ctest +//ADVANCED property for variable: CMAKE_CXX_COMPILER_AR +CMAKE_CXX_COMPILER_AR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_CXX_COMPILER_RANLIB +CMAKE_CXX_COMPILER_RANLIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG @@ -231,6 +262,10 @@ CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1 CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_STANDARD_LIBRARIES CMAKE_CXX_STANDARD_LIBRARIES-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_COMPILER_AR +CMAKE_C_COMPILER_AR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_COMPILER_RANLIB +CMAKE_C_COMPILER_RANLIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_C_FLAGS CMAKE_C_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG @@ -256,7 +291,7 @@ CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1 //Name of external makefile project generator. -CMAKE_EXTRA_GENERATOR:INTERNAL=Android Gradle +CMAKE_EXTRA_GENERATOR:INTERNAL= //Name of generator. CMAKE_GENERATOR:INTERNAL=Ninja //Name of generator platform. @@ -265,9 +300,9 @@ CMAKE_GENERATOR_PLATFORM:INTERNAL= CMAKE_GENERATOR_TOOLSET:INTERNAL= //Source directory with the top level CMakeLists.txt file for this // project -CMAKE_HOME_DIRECTORY:INTERNAL=/home/smartdrone/Working_Private/rosettadrone_work/app +CMAKE_HOME_DIRECTORY:INTERNAL=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app //Install .so files without execute permission. -CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1 +CMAKE_INSTALL_SO_NO_EXE:INTERNAL=0 //ADVANCED property for variable: CMAKE_LINKER CMAKE_LINKER-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS @@ -288,10 +323,12 @@ CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1 CMAKE_OBJCOPY-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_OBJDUMP CMAKE_OBJDUMP-ADVANCED:INTERNAL=1 +//Platform information initialized +CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1 //ADVANCED property for variable: CMAKE_RANLIB CMAKE_RANLIB-ADVANCED:INTERNAL=1 //Path to CMake installation. -CMAKE_ROOT:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6 +CMAKE_ROOT:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG @@ -319,7 +356,7 @@ CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_STRIP CMAKE_STRIP-ADVANCED:INTERNAL=1 //uname command -CMAKE_UNAME:INTERNAL=/bin/uname +CMAKE_UNAME:INTERNAL=/usr/bin/uname //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 diff --git a/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake b/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake deleted file mode 100644 index b267abf..0000000 --- a/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake +++ /dev/null @@ -1,67 +0,0 @@ -set(CMAKE_C_COMPILER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang") -set(CMAKE_C_COMPILER_ARG1 "") -set(CMAKE_C_COMPILER_ID "Clang") -set(CMAKE_C_COMPILER_VERSION "9.0") -set(CMAKE_C_COMPILER_WRAPPER "") -set(CMAKE_C_STANDARD_COMPUTED_DEFAULT "11") -set(CMAKE_C_COMPILE_FEATURES "c_function_prototypes;c_restrict;c_variadic_macros;c_static_assert") -set(CMAKE_C90_COMPILE_FEATURES "c_function_prototypes") -set(CMAKE_C99_COMPILE_FEATURES "c_restrict;c_variadic_macros") -set(CMAKE_C11_COMPILE_FEATURES "c_static_assert") - -set(CMAKE_C_PLATFORM_ID "") -set(CMAKE_C_SIMULATE_ID "") -set(CMAKE_C_SIMULATE_VERSION "") - -set(CMAKE_AR "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ar") -set(CMAKE_RANLIB "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ranlib") -set(CMAKE_LINKER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ld") -set(CMAKE_COMPILER_IS_GNUCC ) -set(CMAKE_C_COMPILER_LOADED 1) -set(CMAKE_C_COMPILER_WORKS TRUE) -set(CMAKE_C_ABI_COMPILED TRUE) -set(CMAKE_COMPILER_IS_MINGW ) -set(CMAKE_COMPILER_IS_CYGWIN ) -if(CMAKE_COMPILER_IS_CYGWIN) - set(CYGWIN 1) - set(UNIX 1) -endif() - -set(CMAKE_C_COMPILER_ENV_VAR "CC") - -if(CMAKE_COMPILER_IS_MINGW) - set(MINGW 1) -endif() -set(CMAKE_C_COMPILER_ID_RUN 1) -set(CMAKE_C_SOURCE_FILE_EXTENSIONS c;m) -set(CMAKE_C_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC) -set(CMAKE_C_LINKER_PREFERENCE 10) - -# Save compiler ABI information. -set(CMAKE_C_SIZEOF_DATA_PTR "4") -set(CMAKE_C_COMPILER_ABI "ELF") -set(CMAKE_C_LIBRARY_ARCHITECTURE "") - -if(CMAKE_C_SIZEOF_DATA_PTR) - set(CMAKE_SIZEOF_VOID_P "${CMAKE_C_SIZEOF_DATA_PTR}") -endif() - -if(CMAKE_C_COMPILER_ABI) - set(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_C_COMPILER_ABI}") -endif() - -if(CMAKE_C_LIBRARY_ARCHITECTURE) - set(CMAKE_LIBRARY_ARCHITECTURE "") -endif() - -set(CMAKE_C_CL_SHOWINCLUDES_PREFIX "") -if(CMAKE_C_CL_SHOWINCLUDES_PREFIX) - set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_C_CL_SHOWINCLUDES_PREFIX}") -endif() - - - - -set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "dl;c;dl") -set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/9.0.8/lib/linux/arm;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/arm-linux-androideabi/lib/armv7-a/thumb;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/22;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib") -set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "") diff --git a/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake b/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake deleted file mode 100644 index da24ebc..0000000 --- a/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake +++ /dev/null @@ -1,68 +0,0 @@ -set(CMAKE_CXX_COMPILER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++") -set(CMAKE_CXX_COMPILER_ARG1 "") -set(CMAKE_CXX_COMPILER_ID "Clang") -set(CMAKE_CXX_COMPILER_VERSION "9.0") -set(CMAKE_CXX_COMPILER_WRAPPER "") -set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT "14") -set(CMAKE_CXX_COMPILE_FEATURES "cxx_template_template_parameters;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates") -set(CMAKE_CXX98_COMPILE_FEATURES "cxx_template_template_parameters") -set(CMAKE_CXX11_COMPILE_FEATURES "cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates") -set(CMAKE_CXX14_COMPILE_FEATURES "cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates") - -set(CMAKE_CXX_PLATFORM_ID "") -set(CMAKE_CXX_SIMULATE_ID "") -set(CMAKE_CXX_SIMULATE_VERSION "") - -set(CMAKE_AR "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ar") -set(CMAKE_RANLIB "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ranlib") -set(CMAKE_LINKER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ld") -set(CMAKE_COMPILER_IS_GNUCXX ) -set(CMAKE_CXX_COMPILER_LOADED 1) -set(CMAKE_CXX_COMPILER_WORKS TRUE) -set(CMAKE_CXX_ABI_COMPILED TRUE) -set(CMAKE_COMPILER_IS_MINGW ) -set(CMAKE_COMPILER_IS_CYGWIN ) -if(CMAKE_COMPILER_IS_CYGWIN) - set(CYGWIN 1) - set(UNIX 1) -endif() - -set(CMAKE_CXX_COMPILER_ENV_VAR "CXX") - -if(CMAKE_COMPILER_IS_MINGW) - set(MINGW 1) -endif() -set(CMAKE_CXX_COMPILER_ID_RUN 1) -set(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC) -set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;mm;CPP) -set(CMAKE_CXX_LINKER_PREFERENCE 30) -set(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1) - -# Save compiler ABI information. -set(CMAKE_CXX_SIZEOF_DATA_PTR "4") -set(CMAKE_CXX_COMPILER_ABI "ELF") -set(CMAKE_CXX_LIBRARY_ARCHITECTURE "") - -if(CMAKE_CXX_SIZEOF_DATA_PTR) - set(CMAKE_SIZEOF_VOID_P "${CMAKE_CXX_SIZEOF_DATA_PTR}") -endif() - -if(CMAKE_CXX_COMPILER_ABI) - set(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_CXX_COMPILER_ABI}") -endif() - -if(CMAKE_CXX_LIBRARY_ARCHITECTURE) - set(CMAKE_LIBRARY_ARCHITECTURE "") -endif() - -set(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX "") -if(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX) - set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_CXX_CL_SHOWINCLUDES_PREFIX}") -endif() - - - - -set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "c++;m;dl;c;dl") -set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/9.0.8/lib/linux/arm;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/arm-linux-androideabi/lib/armv7-a/thumb;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/22;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib") -set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "") diff --git a/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin b/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin deleted file mode 100755 index 8b26638..0000000 Binary files a/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin and /dev/null differ diff --git a/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin b/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin deleted file mode 100755 index 66adf1d..0000000 Binary files a/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin and /dev/null differ diff --git a/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeSystem.cmake b/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeSystem.cmake deleted file mode 100644 index 85af0ef..0000000 --- a/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeSystem.cmake +++ /dev/null @@ -1,15 +0,0 @@ -set(CMAKE_HOST_SYSTEM "Linux-4.15.0-112-generic") -set(CMAKE_HOST_SYSTEM_NAME "Linux") -set(CMAKE_HOST_SYSTEM_VERSION "4.15.0-112-generic") -set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64") - -include("/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake") - -set(CMAKE_SYSTEM "Android-1") -set(CMAKE_SYSTEM_NAME "Android") -set(CMAKE_SYSTEM_VERSION "1") -set(CMAKE_SYSTEM_PROCESSOR "armv7-a") - -set(CMAKE_CROSSCOMPILING "TRUE") - -set(CMAKE_SYSTEM_LOADED 1) diff --git a/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/TargetDirectories.txt b/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/TargetDirectories.txt index b5da756..a0ec628 100644 --- a/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/TargetDirectories.txt +++ b/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/TargetDirectories.txt @@ -1,3 +1,3 @@ -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/rebuild_cache.dir -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/edit_cache.dir -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/djivideojni.dir +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/rebuild_cache.dir +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/edit_cache.dir +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/djivideojni.dir diff --git a/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o b/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o index 55380c3..4080c66 100644 Binary files a/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o and b/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o differ diff --git a/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/feature_tests.bin b/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/feature_tests.bin index 953804c..34eba62 100755 Binary files a/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/feature_tests.bin and b/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/feature_tests.bin differ diff --git a/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/feature_tests.cxx b/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/feature_tests.cxx index a9b4791..703b335 100644 --- a/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/feature_tests.cxx +++ b/app/.cxx/cmake/debug/armeabi-v7a/CMakeFiles/feature_tests.cxx @@ -1,35 +1,35 @@ const char features[] = {"\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_aggregate_nsdmi) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_aggregate_nsdmi) "1" #else "0" #endif "cxx_aggregate_default_initializers\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_alias_templates) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_alias_templates) "1" #else "0" #endif "cxx_alias_templates\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_alignas) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_alignas) "1" #else "0" #endif "cxx_alignas\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_alignas) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_alignas) "1" #else "0" #endif "cxx_alignof\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_attributes) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_attributes) "1" #else "0" @@ -43,35 +43,35 @@ #endif "cxx_attribute_deprecated\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_auto_type) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_auto_type) "1" #else "0" #endif "cxx_auto_type\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_binary_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_binary_literals) "1" #else "0" #endif "cxx_binary_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_constexpr) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_constexpr) "1" #else "0" #endif "cxx_constexpr\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_contextual_conversions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_contextual_conversions) "1" #else "0" #endif "cxx_contextual_conversions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_decltype) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_decltype) "1" #else "0" @@ -85,42 +85,42 @@ #endif "cxx_decltype_auto\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_decltype_incomplete_return_types) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_decltype_incomplete_return_types) "1" #else "0" #endif "cxx_decltype_incomplete_return_types\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_default_function_template_args) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_default_function_template_args) "1" #else "0" #endif "cxx_default_function_template_args\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_defaulted_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_defaulted_functions) "1" #else "0" #endif "cxx_defaulted_functions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_defaulted_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_defaulted_functions) "1" #else "0" #endif "cxx_defaulted_move_initializers\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_delegating_constructors) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_delegating_constructors) "1" #else "0" #endif "cxx_delegating_constructors\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_deleted_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_deleted_functions) "1" #else "0" @@ -134,49 +134,49 @@ #endif "cxx_digit_separators\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_enum_forward_declarations\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_explicit_conversions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_explicit_conversions) "1" #else "0" #endif "cxx_explicit_conversions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_extended_friend_declarations\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_extern_templates\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_override_control) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_override_control) "1" #else "0" #endif "cxx_final\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_func_identifier\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_generalized_initializers) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_generalized_initializers) "1" #else "0" @@ -190,210 +190,210 @@ #endif "cxx_generic_lambdas\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_inheriting_constructors) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_inheriting_constructors) "1" #else "0" #endif "cxx_inheriting_constructors\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_inline_namespaces\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_lambdas) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_lambdas) "1" #else "0" #endif "cxx_lambdas\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_init_captures) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_init_captures) "1" #else "0" #endif "cxx_lambda_init_captures\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_local_type_template_args) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_local_type_template_args) "1" #else "0" #endif "cxx_local_type_template_args\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_long_long_type\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_noexcept) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_noexcept) "1" #else "0" #endif "cxx_noexcept\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_nonstatic_member_init) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_nonstatic_member_init) "1" #else "0" #endif "cxx_nonstatic_member_init\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_nullptr) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_nullptr) "1" #else "0" #endif "cxx_nullptr\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_override_control) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_override_control) "1" #else "0" #endif "cxx_override\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_range_for) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_range_for) "1" #else "0" #endif "cxx_range_for\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_raw_string_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_raw_string_literals) "1" #else "0" #endif "cxx_raw_string_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_reference_qualified_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_reference_qualified_functions) "1" #else "0" #endif "cxx_reference_qualified_functions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_relaxed_constexpr) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_relaxed_constexpr) "1" #else "0" #endif "cxx_relaxed_constexpr\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_return_type_deduction) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_return_type_deduction) "1" #else "0" #endif "cxx_return_type_deduction\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_right_angle_brackets\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_rvalue_references) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_rvalue_references) "1" #else "0" #endif "cxx_rvalue_references\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_sizeof_member\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_static_assert) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_static_assert) "1" #else "0" #endif "cxx_static_assert\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_strong_enums) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_strong_enums) "1" #else "0" #endif "cxx_strong_enums\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 199711L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 199711L "1" #else "0" #endif "cxx_template_template_parameters\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_thread_local) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_thread_local) "1" #else "0" #endif "cxx_thread_local\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_trailing_return) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_trailing_return) "1" #else "0" #endif "cxx_trailing_return_types\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_unicode_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_unicode_literals) "1" #else "0" #endif "cxx_unicode_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_generalized_initializers) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_generalized_initializers) "1" #else "0" #endif "cxx_uniform_initialization\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_unrestricted_unions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_unrestricted_unions) "1" #else "0" #endif "cxx_unrestricted_unions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_user_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_user_literals) "1" #else "0" #endif "cxx_user_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_variable_templates) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_variable_templates) "1" #else "0" #endif "cxx_variable_templates\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_variadic_macros\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_variadic_templates) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_variadic_templates) "1" #else "0" diff --git a/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build.json b/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build.json index 81647f4..3530ca7 100644 --- a/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build.json +++ b/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build.json @@ -1,65 +1,45 @@ - { - "buildFiles" : - [ - "/home/smartdrone/Working_Private/rosettadrone_work/app/CMakeLists.txt" - ], - "cFileExtensions" : [ "c" ], - "cleanCommands" : - [ - "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a --target clean" - ], - "libraries" : - { - "c++_shared-Debug-armeabi-v7a" : - { - "abi" : "armeabi-v7a", - "artifactName" : "c++_shared", - "buildType" : "debug", - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/armeabi-v7a/libc++_shared.so.27", - "toolchain" : "6038786665986016389" - }, - "djivideojni-Debug-armeabi-v7a" : - { - "abi" : "armeabi-v7a", - "artifactName" : "djivideojni", - "buildCommand" : "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a --target djivideojni", - "buildType" : "debug", - "files" : - [ - - { - "flags" : " --target=armv7-none-linux-androideabi22 --gcc-toolchain=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64 --sysroot=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot -Ddjivideojni_EXPORTS -I../../../../src/main/cpp -I../../../../src/main/cpp/include -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/gstreamer-1.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/glib-2.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/lib/glib-2.0/include -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -march=armv7-a -mthumb -Wformat -Werror=format-security -O0 -fno-limit-debug-info -fPIC -c ", - "src" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/dji_video_jni.c", - "workingDirectory" : "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a" - } - ], - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj/armeabi-v7a/libdjivideojni.so", - "toolchain" : "6038786665986016389" - }, - "ffmpegjni-Debug-armeabi-v7a" : - { - "abi" : "armeabi-v7a", - "artifactName" : "ffmpegjni", - "buildType" : "debug", - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/armeabi-v7a/libffmpeg.so", - "toolchain" : "6038786665986016389" - }, - "gstreamer_android-Debug-armeabi-v7a" : - { - "abi" : "armeabi-v7a", - "artifactName" : "gstreamer_android", - "buildType" : "debug", - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/armeabi-v7a/libgstreamer_android.so", - "toolchain" : "6038786665986016389" - } - }, - "toolchains" : - { - "6038786665986016389" : - { - "cCompilerExecutable" : "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang", - "cppCompilerExecutable" : "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++" - } - } -} + "stringTable": { + "0": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a", + "1": "--target=armv7-none-linux-androideabi22 --gcc-toolchain=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64 --sysroot=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -Ddjivideojni_EXPORTS -I../../../../src/main/cpp -I../../../../src/main/cpp/include -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/gstreamer-1.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/glib-2.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/lib/glib-2.0/include -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -fno-addrsig -march=armv7-a -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -O0 -fno-limit-debug-info -fPIC" + }, + "buildFiles": [ + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake" + ], + "cleanCommands": [ + "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a\" clean" + ], + "buildTargetsCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a\" {LIST_OF_TARGETS_TO_BUILD}", + "libraries": { + "djivideojni-Debug-armeabi-v7a": { + "buildCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a\" djivideojni", + "buildType": "debug", + "toolchain": "3669181217", + "abi": "armeabi-v7a", + "artifactName": "djivideojni", + "files": [ + { + "src": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/src/main/cpp/dji_video_jni.c", + "flagsOrdinal": 1, + "workingDirectoryOrdinal": 0 + } + ], + "headers": [], + "output": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/debug/obj/armeabi-v7a/libdjivideojni.so", + "runtimeFiles": [ + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/src/main/cpp/lib/armeabi-v7a/libffmpeg.so" + ] + } + }, + "toolchains": { + "3669181217": { + "cCompilerExecutable": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang" + } + }, + "cFileExtensions": [ + "c" + ], + "cppFileExtensions": [] +} \ No newline at end of file diff --git a/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build_djivideojni_armeabi-v7a.command.txt b/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build_djivideojni_armeabi-v7a.command.txt index 27e3040..59c1c4c 100644 --- a/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build_djivideojni_armeabi-v7a.command.txt +++ b/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build_djivideojni_armeabi-v7a.command.txt @@ -1,8 +1,7 @@ -Executable : /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake +Executable : /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja arguments : ---build -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a ---target +-C +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a djivideojni jvmArgs : diff --git a/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build_djivideojni_armeabi-v7a.stdout.txt b/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build_djivideojni_armeabi-v7a.stdout.txt index 964c94d..2239cbb 100644 --- a/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build_djivideojni_armeabi-v7a.stdout.txt +++ b/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build_djivideojni_armeabi-v7a.stdout.txt @@ -1 +1,22 @@ -ninja: no work to do. +ninja: Entering directory `/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a' +[1/2] Building C object CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o +In file included from ../../../../src/main/cpp/dji_video_jni.c:4: +In file included from ../../../../src/main/cpp/ffmpeg.h:34: +In file included from ../../../../src/main/cpp/cmdutils.h:28: +In file included from ../../../../src/main/cpp/include/libavcodec/avcodec.h:31: +In file included from ../../../../src/main/cpp/include/libavutil/samplefmt.h:24: +In file included from ../../../../src/main/cpp/include/libavutil/avutil.h:289: +In file included from ../../../../src/main/cpp/include/libavutil/common.h:401: +In file included from ../../../../src/main/cpp/include/libavutil/mem.h:33: +../../../../src/main/cpp/include/libavutil/error.h:121:5: warning: non-constant static local variable in inline function may be different in different files [-Wstatic-local-in-inline] + static char str[AV_ERROR_MAX_STRING_SIZE]; + ^ +../../../../src/main/cpp/include/libavutil/error.h:119:1: note: use 'static' to give inline function 'av_err2str' internal linkage +av_always_inline char *av_err2str(int errnum) { +^ +static +../../../../src/main/cpp/include/libavutil/attributes.h:37:30: note: expanded from macro 'av_always_inline' +# define av_always_inline __attribute__((always_inline)) inline + ^ +1 warning generated. +[2/2] Linking C shared library ../../../../build/intermediates/cmake/debug/obj/armeabi-v7a/libdjivideojni.so diff --git a/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build_mini.json b/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build_mini.json index 933c2a4..9db8c81 100644 --- a/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build_mini.json +++ b/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build_mini.json @@ -1,31 +1,22 @@ { "buildFiles": [ - "/home/smartdrone/Working_Private/rosettadrone_work/app/CMakeLists.txt" + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake" ], "cleanCommands": [ - "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a --target clean" + "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a\" clean" ], + "buildTargetsCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a\" {LIST_OF_TARGETS_TO_BUILD}", "libraries": { - "ffmpegjni-Debug-armeabi-v7a": { - "artifactName": "ffmpegjni", - "abi": "armeabi-v7a", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/armeabi-v7a/libffmpeg.so" - }, - "c++_shared-Debug-armeabi-v7a": { - "artifactName": "c++_shared", - "abi": "armeabi-v7a", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/armeabi-v7a/libc++_shared.so.27" - }, - "gstreamer_android-Debug-armeabi-v7a": { - "artifactName": "gstreamer_android", - "abi": "armeabi-v7a", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/armeabi-v7a/libgstreamer_android.so" - }, "djivideojni-Debug-armeabi-v7a": { "artifactName": "djivideojni", - "buildCommand": "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a --target djivideojni", + "buildCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a\" djivideojni", "abi": "armeabi-v7a", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj/armeabi-v7a/libdjivideojni.so" + "output": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/debug/obj/armeabi-v7a/libdjivideojni.so", + "runtimeFiles": [ + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/src/main/cpp/lib/armeabi-v7a/libffmpeg.so" + ] } } } \ No newline at end of file diff --git a/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_generate_cmake_ninja_json_armeabi-v7a.command.txt b/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_generate_cmake_ninja_json_armeabi-v7a.command.txt deleted file mode 100644 index fdf3dbb..0000000 --- a/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_generate_cmake_ninja_json_armeabi-v7a.command.txt +++ /dev/null @@ -1,14 +0,0 @@ -Executable : /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -arguments : --H/home/smartdrone/Working_Private/rosettadrone_work/app --B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a --DANDROID_ABI=armeabi-v7a --DANDROID_PLATFORM=android-22 --DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj/armeabi-v7a --DCMAKE_BUILD_TYPE=Debug --DANDROID_NDK=/home/smartdrone/Android/Sdk/ndk/21.3.6528147 --DCMAKE_TOOLCHAIN_FILE=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake --DCMAKE_MAKE_PROGRAM=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja --GAndroid Gradle - Ninja -jvmArgs : - diff --git a/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_generate_cmake_ninja_json_armeabi-v7a.stderr.txt b/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_generate_cmake_ninja_json_armeabi-v7a.stderr.txt deleted file mode 100644 index e69de29..0000000 diff --git a/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_generate_cmake_ninja_json_armeabi-v7a.stdout.txt b/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_generate_cmake_ninja_json_armeabi-v7a.stdout.txt deleted file mode 100644 index 677d18d..0000000 --- a/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_generate_cmake_ninja_json_armeabi-v7a.stdout.txt +++ /dev/null @@ -1,15 +0,0 @@ --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -- works --- Detecting C compiler ABI info --- Detecting C compiler ABI info - done --- Detecting C compile features --- Detecting C compile features - done --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -- works --- Detecting CXX compiler ABI info --- Detecting CXX compiler ABI info - done --- Detecting CXX compile features --- Detecting CXX compile features - done --- Configuring done --- Generating done --- Build files have been written to: /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a diff --git a/app/.cxx/cmake/debug/armeabi-v7a/build.ninja b/app/.cxx/cmake/debug/armeabi-v7a/build.ninja index 7d8d753..f5d2c7c 100644 --- a/app/.cxx/cmake/debug/armeabi-v7a/build.ninja +++ b/app/.cxx/cmake/debug/armeabi-v7a/build.ninja @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Ninja" Generator, CMake Version 3.6 +# Generated by "Ninja" Generator, CMake Version 3.10 # This file contains all the build statements describing the # compilation DAG. @@ -34,7 +34,7 @@ include rules.ninja # Utility command for rebuild_cache build CMakeFiles/rebuild_cache.util: CUSTOM_COMMAND - COMMAND = cd /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a && /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -H/home/smartdrone/Working_Private/rosettadrone_work/app -B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a + COMMAND = cd /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a && /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake -H/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app -B/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a DESC = Running CMake to regenerate build system... pool = console restat = 1 @@ -44,19 +44,23 @@ build rebuild_cache: phony CMakeFiles/rebuild_cache.util # Utility command for edit_cache build CMakeFiles/edit_cache.util: CUSTOM_COMMAND - COMMAND = cd /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a && /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. + COMMAND = cd /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a && /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. DESC = No interactive CMake dialog available... restat = 1 build edit_cache: phony CMakeFiles/edit_cache.util # ============================================================================= # Object build statements for SHARED_LIBRARY target djivideojni -build CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o: C_COMPILER__djivideojni ../../../../src/main/cpp/dji_video_jni.c + +############################################# +# Order-only phony target for djivideojni + +build cmake_object_order_depends_target_djivideojni: phony +build CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o: C_COMPILER__djivideojni ../../../../src/main/cpp/dji_video_jni.c || cmake_object_order_depends_target_djivideojni DEFINES = -Ddjivideojni_EXPORTS DEP_FILE = CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o.d - FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -march=armv7-a -mthumb -Wformat -Werror=format-security -O0 -fno-limit-debug-info -fPIC + FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -fno-addrsig -march=armv7-a -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -O0 -fno-limit-debug-info -fPIC INCLUDES = -I../../../../src/main/cpp -I../../../../src/main/cpp/include -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/gstreamer-1.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/glib-2.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/lib/glib-2.0/include - IN_ABS = /home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/dji_video_jni.c OBJECT_DIR = CMakeFiles/djivideojni.dir OBJECT_FILE_DIR = CMakeFiles/djivideojni.dir/src/main/cpp @@ -67,10 +71,10 @@ build CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o: C_COMPILER__dji ############################################# # Link the shared library ../../../../build/intermediates/cmake/debug/obj/armeabi-v7a/libdjivideojni.so -build ../../../../build/intermediates/cmake/debug/obj/armeabi-v7a/libdjivideojni.so: C_SHARED_LIBRARY_LINKER__djivideojni CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o | ../../../../src/main/cpp/lib/armeabi-v7a/libffmpeg.so /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/22/liblog.so - LANGUAGE_COMPILE_FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -march=armv7-a -mthumb -Wformat -Werror=format-security -O0 -fno-limit-debug-info - LINK_FLAGS = -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libgcc_real.a -Wl,--exclude-libs,libatomic.a -static-libstdc++ -Wl,--build-id -Wl,--fatal-warnings -Wl,--exclude-libs,libunwind.a -Wl,--no-undefined -Qunused-arguments - LINK_LIBRARIES = ../../../../src/main/cpp/lib/armeabi-v7a/libffmpeg.so /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/22/liblog.so -latomic -lm +build ../../../../build/intermediates/cmake/debug/obj/armeabi-v7a/libdjivideojni.so: C_SHARED_LIBRARY_LINKER__djivideojni CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o | ../../../../src/main/cpp/lib/armeabi-v7a/libffmpeg.so /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi/22/liblog.so + LANGUAGE_COMPILE_FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -fno-addrsig -march=armv7-a -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -O0 -fno-limit-debug-info + LINK_FLAGS = -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -static-libstdc++ -Wl,--build-id -Wl,--warn-shared-textrel -Wl,--fatal-warnings -Wl,--exclude-libs,libunwind.a -Wl,--no-undefined -Qunused-arguments -Wl,-z,noexecstack + LINK_LIBRARIES = ../../../../src/main/cpp/lib/armeabi-v7a/libffmpeg.so -llog -latomic -lm OBJECT_DIR = CMakeFiles/djivideojni.dir POST_BUILD = : PRE_LINK = : @@ -104,13 +108,13 @@ default all ############################################# # Re-run CMake if any of its inputs changed. -build build.ninja: RERUN_CMAKE | ../../../../CMakeLists.txt /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompilerABI.c /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompilerABI.cpp /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCommonLanguageInclude.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompileFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompilerABI.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeFindBinUtils.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeGenericSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeLanguageInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeParseImplicitLinkInfo.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystem.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInitialize.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCompilerCommon.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/GNU.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Internal/FeatureTesting.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Android.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Linux.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/UnixPaths.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/platforms.cmake CMakeCache.txt CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx +build build.ninja: RERUN_CMAKE | ../../../../CMakeLists.txt /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompilerABI.c /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompilerABI.cpp /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCommonLanguageInclude.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompileFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompilerABI.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeFindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeGenericSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeLanguageInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeParseImplicitLinkInfo.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystem.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInitialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCompilerCommon.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/CMakeCommonCompilerMacros.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-FindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/GNU.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Internal/FeatureTesting.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Initialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android/Determine-Compiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Linux.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/UnixPaths.cmake CMakeCache.txt CMakeFiles/3.10.2/CMakeCCompiler.cmake CMakeFiles/3.10.2/CMakeCXXCompiler.cmake CMakeFiles/3.10.2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx pool = console ############################################# # A missing CMake input file is not an error. -build ../../../../CMakeLists.txt /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompilerABI.c /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompilerABI.cpp /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCommonLanguageInclude.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompileFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompilerABI.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeFindBinUtils.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeGenericSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeLanguageInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeParseImplicitLinkInfo.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystem.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInitialize.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCompilerCommon.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/GNU.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Internal/FeatureTesting.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Android.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Linux.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/UnixPaths.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/platforms.cmake CMakeCache.txt CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx: phony +build ../../../../CMakeLists.txt /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompilerABI.c /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompilerABI.cpp /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCommonLanguageInclude.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompileFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompilerABI.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeFindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeGenericSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeLanguageInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeParseImplicitLinkInfo.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystem.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInitialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCompilerCommon.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/CMakeCommonCompilerMacros.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-FindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/GNU.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Internal/FeatureTesting.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Initialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android/Determine-Compiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Linux.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/UnixPaths.cmake CMakeCache.txt CMakeFiles/3.10.2/CMakeCCompiler.cmake CMakeFiles/3.10.2/CMakeCXXCompiler.cmake CMakeFiles/3.10.2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx: phony ############################################# # Clean all the built files. diff --git a/app/.cxx/cmake/debug/armeabi-v7a/build_command.txt b/app/.cxx/cmake/debug/armeabi-v7a/build_command.txt index fdf3dbb..2c974bf 100644 --- a/app/.cxx/cmake/debug/armeabi-v7a/build_command.txt +++ b/app/.cxx/cmake/debug/armeabi-v7a/build_command.txt @@ -1,14 +1,21 @@ -Executable : /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake + Executable : /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake arguments : --H/home/smartdrone/Working_Private/rosettadrone_work/app --B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a --DANDROID_ABI=armeabi-v7a --DANDROID_PLATFORM=android-22 --DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj/armeabi-v7a +-H/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app +-DCMAKE_FIND_ROOT_PATH=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/prefab/armeabi-v7a/prefab -DCMAKE_BUILD_TYPE=Debug --DANDROID_NDK=/home/smartdrone/Android/Sdk/ndk/21.3.6528147 --DCMAKE_TOOLCHAIN_FILE=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake --DCMAKE_MAKE_PROGRAM=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja --GAndroid Gradle - Ninja +-DCMAKE_TOOLCHAIN_FILE=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake +-DANDROID_ABI=armeabi-v7a +-DANDROID_NDK=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 +-DANDROID_PLATFORM=android-22 +-DCMAKE_ANDROID_ARCH_ABI=armeabi-v7a +-DCMAKE_ANDROID_NDK=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 +-DCMAKE_EXPORT_COMPILE_COMMANDS=ON +-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/debug/obj/armeabi-v7a +-DCMAKE_MAKE_PROGRAM=/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja +-DCMAKE_SYSTEM_NAME=Android +-DCMAKE_SYSTEM_VERSION=22 +-B/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a +-GNinja jvmArgs : +Build command args: diff --git a/app/.cxx/cmake/debug/armeabi-v7a/build_model.json b/app/.cxx/cmake/debug/armeabi-v7a/build_model.json index 27921a9..e828cd9 100644 --- a/app/.cxx/cmake/debug/armeabi-v7a/build_model.json +++ b/app/.cxx/cmake/debug/armeabi-v7a/build_model.json @@ -1,69 +1,203 @@ { - "variant": { - "module": { - "rootBuildGradleFolder": "/home/smartdrone/Working_Private/rosettadrone_work", - "sdkFolder": "/home/smartdrone/Android/Sdk", - "isNativeCompilerSettingsCacheEnabled": false, - "isBuildOnlyTargetAbiEnabled": true, - "ideBuildTargetAbi": "arm64-v8a,armeabi-v7a,armeabi", - "splitsAbiFilterSet": [], - "intermediatesFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates", - "gradleModulePathName": ":app", - "moduleRootFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app", - "makeFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/CMakeLists.txt", - "buildSystem": "CMAKE", - "compilerSettingsCacheFolder": "/home/smartdrone/Working_Private/rosettadrone_work/.cxx", - "cxxFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx", - "ndkFolder": "/home/smartdrone/Android/Sdk/ndk/21.3.6528147", - "ndkVersion": "21.3.6528147", - "ndkSupportedAbiList": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" + "abi": "ARMEABI_V7A", + "abiPlatformVersion": 22, + "buildSettings": { + "environmentVariables": [] + }, + "cmake": { + "cmakeArtifactsBaseFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a", + "cmakeServerLogFile": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a/cmake_server_log.txt", + "cmakeWrappingBaseFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cxx/debug/armeabi-v7a", + "effectiveConfiguration": { + "name": "traditional-android-studio-cmake-environment", + "description": "Composite reified CMakeSettings configuration", + "generator": "Ninja", + "inheritEnvironments": [ + "ndk" ], + "buildRoot": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a", + "cmakeToolchain": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "cmakeExecutable": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake", + "variables": [ + { + "name": "CMAKE_FIND_ROOT_PATH", + "value": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/prefab/armeabi-v7a/prefab" + }, + { + "name": "CMAKE_BUILD_TYPE", + "value": "Debug" + }, + { + "name": "CMAKE_TOOLCHAIN_FILE", + "value": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake" + }, + { + "name": "ANDROID_ABI", + "value": "armeabi-v7a" + }, + { + "name": "ANDROID_NDK", + "value": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944" + }, + { + "name": "ANDROID_PLATFORM", + "value": "android-22" + }, + { + "name": "CMAKE_ANDROID_ARCH_ABI", + "value": "armeabi-v7a" + }, + { + "name": "CMAKE_ANDROID_NDK", + "value": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944" + }, + { + "name": "CMAKE_EXPORT_COMPILE_COMMANDS", + "value": "ON" + }, + { + "name": "CMAKE_LIBRARY_OUTPUT_DIRECTORY", + "value": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/debug/obj/armeabi-v7a" + }, + { + "name": "CMAKE_MAKE_PROGRAM", + "value": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja" + }, + { + "name": "CMAKE_SYSTEM_NAME", + "value": "Android" + }, + { + "name": "CMAKE_SYSTEM_VERSION", + "value": "22" + } + ] + } + }, + "cxxBuildFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a", + "info": { + "abi": "ARMEABI_V7A", + "bitness": 32, + "deprecated": false, + "default": true + }, + "originalCxxBuildFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a", + "variant": { + "buildSystemArgumentList": [], + "buildTargetSet": [], + "implicitBuildTargetSet": [], + "cFlagsList": [], + "cmakeSettingsConfiguration": "android-gradle-plugin-predetermined-name", + "cppFlagsList": [], + "isDebuggableEnabled": true, + "module": { + "buildSystem": "CMAKE", + "cmake": { + "cmakeExe": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake", + "minimumCmakeVersion": "3.10.2", + "ninjaExe": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja" + }, + "cmakeToolchainFile": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "cxxFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx", + "gradleModulePathName": ":app", + "intermediatesFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates", + "makeFile": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "moduleBuildFile": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build.gradle", + "moduleRootFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app", "ndkDefaultAbiList": [ "ARMEABI_V7A", "ARM64_V8A", "X86", "X86_64" ], - "cmakeToolchainFile": "." + "ndkFolder": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944", + "ndkMetaAbiList": [ + { + "abi": "ARMEABI_V7A", + "bitness": 32, + "deprecated": false, + "default": true + }, + { + "abi": "ARM64_V8A", + "bitness": 64, + "deprecated": false, + "default": true + }, + { + "abi": "X86", + "bitness": 32, + "deprecated": false, + "default": true + }, + { + "abi": "X86_64", + "bitness": 64, + "deprecated": false, + "default": true + } + ], + "ndkMetaPlatforms": { + "min": 16, + "max": 29, + "aliases": { + "20": 19, + "25": 24, + "J": 16, + "J-MR1": 17, + "J-MR2": 18, + "K": 19, + "L": 21, + "L-MR1": 22, + "M": 23, + "N": 24, + "N-MR1": 24, + "O": 26, + "O-MR1": 27, + "P": 28, + "Q": 29 + } + }, + "ndkSupportedAbiList": [ + "ARMEABI_V7A", + "ARM64_V8A", + "X86", + "X86_64" + ], + "ndkDefaultStl": "LIBCXX_STATIC", + "ndkVersion": "20.1.5948944", + "project": { + "compilerSettingsCacheFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/.cxx", + "cxxFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/.cxx", + "isBuildOnlyTargetAbiEnabled": true, + "isCmakeBuildCohabitationEnabled": false, + "isNativeCompilerSettingsCacheEnabled": false, + "rootBuildGradleFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work", + "sdkFolder": "/Users/teni/Library/Android/sdk", + "isPrefabEnabled": false + }, + "splitsAbiFilterSet": [], + "stlSharedObjectMap": { + "LIBCXX_SHARED": { + "ARMEABI_V7A": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi/libc++_shared.so", + "ARM64_V8A": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so", + "X86": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/i686-linux-android/libc++_shared.so", + "X86_64": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/x86_64-linux-android/libc++_shared.so" + }, + "LIBCXX_STATIC": {}, + "NONE": {}, + "SYSTEM": {} + } }, - "buildSystemArgumentList": [], - "cFlagList": [], - "cppFlagsList": [], + "objFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/debug/obj", "variantName": "debug", - "soFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/lib", - "objFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj", - "jsonFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug", - "gradleBuildOutputFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug", - "isDebuggableEnabled": true, "validAbiList": [ + "ARMEABI_V7A", "ARM64_V8A", - "ARMEABI_V7A" + "X86" ], - "buildTargetSet": [] + "prefabDirectory": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/prefab", + "prefabPackageDirectoryList": [] }, - "abi": "ARMEABI_V7A", - "abiPlatformVersion": 22, - "cxxBuildFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a", - "jsonFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build.json", - "gradleBuildOutputFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/armeabi-v7a", - "objFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj/armeabi-v7a", - "buildCommandFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a/build_command.txt", - "buildOutputFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a/build_output.txt", - "modelOutputFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a/build_model.json", - "cmake": { - "cmakeListsWrapperFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/armeabi-v7a/CMakeLists.txt", - "toolchainWrapperFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/armeabi-v7a/android_gradle_build.toolchain.cmake", - "buildGenerationStateFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/armeabi-v7a/build_generation_state.json", - "cacheKeyFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/armeabi-v7a/compiler_cache_key.json", - "compilerCacheUseFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/armeabi-v7a/compiler_cache_use.json", - "compilerCacheWriteFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/armeabi-v7a/compiler_cache_write.json", - "toolchainSettingsFromCacheFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/armeabi-v7a/compiler_settings_cache.cmake", - "cmakeWrappingBaseFolder": "." - }, - "jsonGenerationLoggingRecordFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a/json_generation_record.json", - "compileCommandsJsonFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a/compile_commands.json" + "prefabFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/prefab/armeabi-v7a" } \ No newline at end of file diff --git a/app/.cxx/cmake/debug/armeabi-v7a/build_output.txt b/app/.cxx/cmake/debug/armeabi-v7a/build_output.txt index d2eafdb..bc40114 100644 --- a/app/.cxx/cmake/debug/armeabi-v7a/build_output.txt +++ b/app/.cxx/cmake/debug/armeabi-v7a/build_output.txt @@ -1,15 +1,13 @@ --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -- works --- Detecting C compiler ABI info --- Detecting C compiler ABI info - done --- Detecting C compile features --- Detecting C compile features - done --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -- works --- Detecting CXX compiler ABI info --- Detecting CXX compiler ABI info - done --- Detecting CXX compile features --- Detecting CXX compile features - done --- Configuring done --- Generating done --- Build files have been written to: /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a \ No newline at end of file +Check for working C compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang +Check for working C compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang -- works +Detecting C compiler ABI info +Detecting C compiler ABI info - done +Detecting C compile features +Detecting C compile features - done +Check for working CXX compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ +Check for working CXX compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ -- works +Detecting CXX compiler ABI info +Detecting CXX compiler ABI info - done +Detecting CXX compile features +Detecting CXX compile features - done +Configuring done \ No newline at end of file diff --git a/app/.cxx/cmake/debug/armeabi-v7a/cmake_install.cmake b/app/.cxx/cmake/debug/armeabi-v7a/cmake_install.cmake index 0fa6962..58bff3a 100644 --- a/app/.cxx/cmake/debug/armeabi-v7a/cmake_install.cmake +++ b/app/.cxx/cmake/debug/armeabi-v7a/cmake_install.cmake @@ -1,4 +1,4 @@ -# Install script for directory: /home/smartdrone/Working_Private/rosettadrone_work/app +# Install script for directory: /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app # Set the install prefix if(NOT DEFINED CMAKE_INSTALL_PREFIX) @@ -29,7 +29,12 @@ endif() # Install shared libraries without execute permission? if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) - set(CMAKE_INSTALL_SO_NO_EXE "1") + set(CMAKE_INSTALL_SO_NO_EXE "0") +endif() + +# Is this installation the result of a crosscompile? +if(NOT DEFINED CMAKE_CROSSCOMPILING) + set(CMAKE_CROSSCOMPILING "TRUE") endif() if(CMAKE_INSTALL_COMPONENT) @@ -40,5 +45,5 @@ endif() string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT "${CMAKE_INSTALL_MANIFEST_FILES}") -file(WRITE "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a/${CMAKE_INSTALL_MANIFEST}" +file(WRITE "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a/${CMAKE_INSTALL_MANIFEST}" "${CMAKE_INSTALL_MANIFEST_CONTENT}") diff --git a/app/.cxx/cmake/debug/armeabi-v7a/json_generation_record.json b/app/.cxx/cmake/debug/armeabi-v7a/json_generation_record.json index 7411a0c..cc059f1 100644 --- a/app/.cxx/cmake/debug/armeabi-v7a/json_generation_record.json +++ b/app/.cxx/cmake/debug/armeabi-v7a/json_generation_record.json @@ -1,14 +1,44 @@ [ { "level": "INFO", - "message": "Start JSON generation. Platform version: 22 min SDK version: armeabi-v7a" + "message": "Start JSON generation. Platform version: 22 min SDK version: armeabi-v7a", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|armeabi-v7a" }, { "level": "INFO", - "message": "JSON \u0027/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build.json\u0027 was up-to-date" + "message": "No CMake version was specified in build.gradle. Using default version 3.10.2.", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|armeabi-v7a" }, { "level": "INFO", - "message": "JSON generation completed without problems" + "message": "Trying to locate CMake in local SDK repository.", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|armeabi-v7a" + }, + { + "level": "INFO", + "message": "- CMake found in SDK at \u0027/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404\u0027 had version \u00273.10.2\u0027", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|armeabi-v7a" + }, + { + "level": "INFO", + "message": "CMake \u00273.6.0\u0027 found in SDK did not match requested version \u00273.10.2\u0027.", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|armeabi-v7a" + }, + { + "level": "INFO", + "message": "JSON \u0027/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a/android_gradle_build.json\u0027 was up-to-date", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|armeabi-v7a" + }, + { + "level": "INFO", + "message": "JSON generation completed without problems", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|armeabi-v7a" } ] \ No newline at end of file diff --git a/app/.cxx/cmake/debug/armeabi-v7a/rules.ninja b/app/.cxx/cmake/debug/armeabi-v7a/rules.ninja index fb8b3aa..6d26ddd 100644 --- a/app/.cxx/cmake/debug/armeabi-v7a/rules.ninja +++ b/app/.cxx/cmake/debug/armeabi-v7a/rules.ninja @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Ninja" Generator, CMake Version 3.6 +# Generated by "Ninja" Generator, CMake Version 3.10 # This file contains all the rules used to get the outputs files # built from the input files. @@ -25,7 +25,7 @@ rule CUSTOM_COMMAND rule C_COMPILER__djivideojni depfile = $DEP_FILE deps = gcc - command = /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=armv7-none-linux-androideabi22 --gcc-toolchain=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64 --sysroot=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot $DEFINES $INCLUDES $FLAGS -MD -MT $out -MF $DEP_FILE -o $out -c $IN_ABS + command = /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang --target=armv7-none-linux-androideabi22 --gcc-toolchain=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64 --sysroot=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot $DEFINES $INCLUDES $FLAGS -MD -MT $out -MF $DEP_FILE -o $out -c $in description = Building C object $out @@ -33,7 +33,7 @@ rule C_COMPILER__djivideojni # Rule for linking C shared library. rule C_SHARED_LIBRARY_LINKER__djivideojni - command = $PRE_LINK && /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=armv7-none-linux-androideabi22 --gcc-toolchain=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64 --sysroot=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot -fPIC $LANGUAGE_COMPILE_FLAGS $ARCH_FLAGS $LINK_FLAGS -shared $SONAME_FLAG$SONAME -o $TARGET_FILE $in $LINK_PATH $LINK_LIBRARIES && $POST_BUILD + command = $PRE_LINK && /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang --target=armv7-none-linux-androideabi22 --gcc-toolchain=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64 --sysroot=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -fPIC $LANGUAGE_COMPILE_FLAGS $ARCH_FLAGS $LINK_FLAGS -shared $SONAME_FLAG$SONAME -o $TARGET_FILE $in $LINK_PATH $LINK_LIBRARIES && $POST_BUILD description = Linking C shared library $TARGET_FILE restat = $RESTAT @@ -42,7 +42,7 @@ rule C_SHARED_LIBRARY_LINKER__djivideojni # Rule for re-running cmake. rule RERUN_CMAKE - command = /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -H/home/smartdrone/Working_Private/rosettadrone_work/app -B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a + command = /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake -H/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app -B/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/armeabi-v7a description = Re-running CMake... generator = 1 @@ -51,7 +51,7 @@ rule RERUN_CMAKE # Rule for cleaning all built files. rule CLEAN - command = /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja -t clean + command = /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -t clean description = Cleaning all built files... @@ -59,6 +59,6 @@ rule CLEAN # Rule for printing all primary targets available. rule HELP - command = /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja -t targets + command = /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -t targets description = All primary targets available: diff --git a/app/.cxx/cmake/debug/x86/.ninja_deps b/app/.cxx/cmake/debug/x86/.ninja_deps index 5b2908c..d4cb35c 100644 Binary files a/app/.cxx/cmake/debug/x86/.ninja_deps and b/app/.cxx/cmake/debug/x86/.ninja_deps differ diff --git a/app/.cxx/cmake/debug/x86/.ninja_log b/app/.cxx/cmake/debug/x86/.ninja_log index 2e3b779..23b0c58 100644 --- a/app/.cxx/cmake/debug/x86/.ninja_log +++ b/app/.cxx/cmake/debug/x86/.ninja_log @@ -1,15 +1,3 @@ # ninja log v5 -0 50 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o 67f1f8d596d35e6e -50 59 0 ../../../../build/intermediates/cmake/debug/obj/x86/libdjivideojni.so 9edf63f68aba8b81 -0 57 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o 67f1f8d596d35e6e -57 65 0 ../../../../build/intermediates/cmake/debug/obj/x86/libdjivideojni.so 9edf63f68aba8b81 -0 55 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o 67f1f8d596d35e6e -56 78 0 ../../../../build/intermediates/cmake/debug/obj/x86/libdjivideojni.so 9edf63f68aba8b81 -0 56 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o 67f1f8d596d35e6e -56 64 0 ../../../../build/intermediates/cmake/debug/obj/x86/libdjivideojni.so 9edf63f68aba8b81 -0 64 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o 67f1f8d596d35e6e -64 74 0 ../../../../build/intermediates/cmake/debug/obj/x86/libdjivideojni.so 9edf63f68aba8b81 -0 62 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o 67f1f8d596d35e6e -62 96 0 ../../../../build/intermediates/cmake/debug/obj/x86/libdjivideojni.so 9edf63f68aba8b81 -0 60 0 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o 67f1f8d596d35e6e -60 69 0 ../../../../build/intermediates/cmake/debug/obj/x86/libdjivideojni.so 9edf63f68aba8b81 +1 246 1607019445 CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o 336548dddf78b2ce +247 295 1607019445 ../../../../build/intermediates/cmake/debug/obj/x86/libdjivideojni.so 775578238b3d9cef diff --git a/app/.cxx/cmake/debug/x86/CMakeCache.txt b/app/.cxx/cmake/debug/x86/CMakeCache.txt index 2eace7c..e5e6b9a 100644 --- a/app/.cxx/cmake/debug/x86/CMakeCache.txt +++ b/app/.cxx/cmake/debug/x86/CMakeCache.txt @@ -1,6 +1,6 @@ # This is the CMakeCache file. -# For build in directory: /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86 -# It was generated by CMake: /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake +# For build in directory: /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86 +# It was generated by CMake: /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. # If you do want to change a value, simply edit, save, and exit the editor. @@ -18,13 +18,19 @@ ANDROID_ABI:UNINITIALIZED=x86 //No help, variable specified on the command line. -ANDROID_NDK:UNINITIALIZED=/home/smartdrone/Android/Sdk/ndk/21.3.6528147 +ANDROID_NDK:UNINITIALIZED=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 //No help, variable specified on the command line. ANDROID_PLATFORM:UNINITIALIZED=android-22 +//No help, variable specified on the command line. +CMAKE_ANDROID_ARCH_ABI:UNINITIALIZED=x86 + +//No help, variable specified on the command line. +CMAKE_ANDROID_NDK:UNINITIALIZED=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 + //Archiver -CMAKE_AR:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ar +CMAKE_AR:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android-ar //Flags used by the compiler during all build types. CMAKE_ASM_FLAGS:STRING= @@ -39,6 +45,12 @@ CMAKE_ASM_FLAGS_RELEASE:STRING= // CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel. CMAKE_BUILD_TYPE:STRING=Debug +//LLVM archiver +CMAKE_CXX_COMPILER_AR:FILEPATH=CMAKE_CXX_COMPILER_AR-NOTFOUND + +//Generate index for LLVM archive +CMAKE_CXX_COMPILER_RANLIB:FILEPATH=CMAKE_CXX_COMPILER_RANLIB-NOTFOUND + //Flags used by the compiler during all build types. CMAKE_CXX_FLAGS:STRING= @@ -58,6 +70,12 @@ CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG //Libraries linked by default with all C++ applications. CMAKE_CXX_STANDARD_LIBRARIES:STRING=-latomic -lm +//LLVM archiver +CMAKE_C_COMPILER_AR:FILEPATH=CMAKE_C_COMPILER_AR-NOTFOUND + +//Generate index for LLVM archive +CMAKE_C_COMPILER_RANLIB:FILEPATH=CMAKE_C_COMPILER_RANLIB-NOTFOUND + //Flags used by the compiler during all build types. CMAKE_C_FLAGS:STRING= @@ -93,19 +111,22 @@ CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING= CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Enable/Disable output of compile commands during generation. -CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF +CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON + +//No help, variable specified on the command line. +CMAKE_FIND_ROOT_PATH:UNINITIALIZED=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/prefab/x86/prefab //Install path prefix, prepended onto install directories. CMAKE_INSTALL_PREFIX:PATH=/usr/local //No help, variable specified on the command line. -CMAKE_LIBRARY_OUTPUT_DIRECTORY:UNINITIALIZED=/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj/x86 +CMAKE_LIBRARY_OUTPUT_DIRECTORY:UNINITIALIZED=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/debug/obj/x86 //Path to a program. -CMAKE_LINKER:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ld +CMAKE_LINKER:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android-ld //No help, variable specified on the command line. -CMAKE_MAKE_PROGRAM:UNINITIALIZED=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja +CMAKE_MAKE_PROGRAM:UNINITIALIZED=/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja //Flags used by the linker during the creation of modules. CMAKE_MODULE_LINKER_FLAGS:STRING= @@ -123,19 +144,19 @@ CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Path to a program. -CMAKE_NM:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-nm +CMAKE_NM:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android-nm //Path to a program. -CMAKE_OBJCOPY:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-objcopy +CMAKE_OBJCOPY:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android-objcopy //Path to a program. -CMAKE_OBJDUMP:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-objdump +CMAKE_OBJDUMP:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android-objdump //Value Computed by CMake CMAKE_PROJECT_NAME:STATIC=Project //Ranlib -CMAKE_RANLIB:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ranlib +CMAKE_RANLIB:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android-ranlib //Flags used by the linker during the creation of dll's. CMAKE_SHARED_LINKER_FLAGS:STRING= @@ -175,10 +196,16 @@ CMAKE_STATIC_LINKER_FLAGS_RELEASE:STRING= CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Path to a program. -CMAKE_STRIP:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-strip +CMAKE_STRIP:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android-strip + +//No help, variable specified on the command line. +CMAKE_SYSTEM_NAME:UNINITIALIZED=Android + +//No help, variable specified on the command line. +CMAKE_SYSTEM_VERSION:UNINITIALIZED=22 //The CMake toolchain file -CMAKE_TOOLCHAIN_FILE:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake +CMAKE_TOOLCHAIN_FILE:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake //If this value is on, makefiles will be generated without the // .SILENT directive, and all commands will be echoed to the console @@ -187,16 +214,16 @@ CMAKE_TOOLCHAIN_FILE:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/buil CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE //Value Computed by CMake -Project_BINARY_DIR:STATIC=/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86 +Project_BINARY_DIR:STATIC=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86 //Value Computed by CMake -Project_SOURCE_DIR:STATIC=/home/smartdrone/Working_Private/rosettadrone_work/app +Project_SOURCE_DIR:STATIC=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app //Dependencies for the target -djivideojni_LIB_DEPENDS:STATIC=general;ffmpegjni;general;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/22/liblog.so; +djivideojni_LIB_DEPENDS:STATIC=general;ffmpegjni;general;/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/i686-linux-android/22/liblog.so; //Path to a library. -log-lib:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/22/liblog.so +log-lib:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/i686-linux-android/22/liblog.so ######################## @@ -206,19 +233,23 @@ log-lib:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/p //ADVANCED property for variable: CMAKE_AR CMAKE_AR-ADVANCED:INTERNAL=1 //This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86 +CMAKE_CACHEFILE_DIR:INTERNAL=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86 //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3 //Minor version of cmake used to create the current loaded cache -CMAKE_CACHE_MINOR_VERSION:INTERNAL=6 +CMAKE_CACHE_MINOR_VERSION:INTERNAL=10 //Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=0 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=2 //Path to CMake executable. -CMAKE_COMMAND:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake +CMAKE_COMMAND:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake //Path to cpack program executable. -CMAKE_CPACK_COMMAND:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cpack +CMAKE_CPACK_COMMAND:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cpack //Path to ctest program executable. -CMAKE_CTEST_COMMAND:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ctest +CMAKE_CTEST_COMMAND:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/ctest +//ADVANCED property for variable: CMAKE_CXX_COMPILER_AR +CMAKE_CXX_COMPILER_AR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_CXX_COMPILER_RANLIB +CMAKE_CXX_COMPILER_RANLIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG @@ -231,6 +262,10 @@ CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1 CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_STANDARD_LIBRARIES CMAKE_CXX_STANDARD_LIBRARIES-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_COMPILER_AR +CMAKE_C_COMPILER_AR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_COMPILER_RANLIB +CMAKE_C_COMPILER_RANLIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_C_FLAGS CMAKE_C_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG @@ -256,7 +291,7 @@ CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1 //Name of external makefile project generator. -CMAKE_EXTRA_GENERATOR:INTERNAL=Android Gradle +CMAKE_EXTRA_GENERATOR:INTERNAL= //Name of generator. CMAKE_GENERATOR:INTERNAL=Ninja //Name of generator platform. @@ -265,9 +300,9 @@ CMAKE_GENERATOR_PLATFORM:INTERNAL= CMAKE_GENERATOR_TOOLSET:INTERNAL= //Source directory with the top level CMakeLists.txt file for this // project -CMAKE_HOME_DIRECTORY:INTERNAL=/home/smartdrone/Working_Private/rosettadrone_work/app +CMAKE_HOME_DIRECTORY:INTERNAL=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app //Install .so files without execute permission. -CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1 +CMAKE_INSTALL_SO_NO_EXE:INTERNAL=0 //ADVANCED property for variable: CMAKE_LINKER CMAKE_LINKER-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS @@ -288,10 +323,12 @@ CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1 CMAKE_OBJCOPY-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_OBJDUMP CMAKE_OBJDUMP-ADVANCED:INTERNAL=1 +//Platform information initialized +CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1 //ADVANCED property for variable: CMAKE_RANLIB CMAKE_RANLIB-ADVANCED:INTERNAL=1 //Path to CMake installation. -CMAKE_ROOT:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6 +CMAKE_ROOT:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG @@ -319,7 +356,7 @@ CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_STRIP CMAKE_STRIP-ADVANCED:INTERNAL=1 //uname command -CMAKE_UNAME:INTERNAL=/bin/uname +CMAKE_UNAME:INTERNAL=/usr/bin/uname //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 diff --git a/app/.cxx/cmake/debug/x86/CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake b/app/.cxx/cmake/debug/x86/CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake deleted file mode 100644 index f1110f4..0000000 --- a/app/.cxx/cmake/debug/x86/CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake +++ /dev/null @@ -1,67 +0,0 @@ -set(CMAKE_C_COMPILER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang") -set(CMAKE_C_COMPILER_ARG1 "") -set(CMAKE_C_COMPILER_ID "Clang") -set(CMAKE_C_COMPILER_VERSION "9.0") -set(CMAKE_C_COMPILER_WRAPPER "") -set(CMAKE_C_STANDARD_COMPUTED_DEFAULT "11") -set(CMAKE_C_COMPILE_FEATURES "c_function_prototypes;c_restrict;c_variadic_macros;c_static_assert") -set(CMAKE_C90_COMPILE_FEATURES "c_function_prototypes") -set(CMAKE_C99_COMPILE_FEATURES "c_restrict;c_variadic_macros") -set(CMAKE_C11_COMPILE_FEATURES "c_static_assert") - -set(CMAKE_C_PLATFORM_ID "") -set(CMAKE_C_SIMULATE_ID "") -set(CMAKE_C_SIMULATE_VERSION "") - -set(CMAKE_AR "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ar") -set(CMAKE_RANLIB "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ranlib") -set(CMAKE_LINKER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ld") -set(CMAKE_COMPILER_IS_GNUCC ) -set(CMAKE_C_COMPILER_LOADED 1) -set(CMAKE_C_COMPILER_WORKS TRUE) -set(CMAKE_C_ABI_COMPILED TRUE) -set(CMAKE_COMPILER_IS_MINGW ) -set(CMAKE_COMPILER_IS_CYGWIN ) -if(CMAKE_COMPILER_IS_CYGWIN) - set(CYGWIN 1) - set(UNIX 1) -endif() - -set(CMAKE_C_COMPILER_ENV_VAR "CC") - -if(CMAKE_COMPILER_IS_MINGW) - set(MINGW 1) -endif() -set(CMAKE_C_COMPILER_ID_RUN 1) -set(CMAKE_C_SOURCE_FILE_EXTENSIONS c;m) -set(CMAKE_C_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC) -set(CMAKE_C_LINKER_PREFERENCE 10) - -# Save compiler ABI information. -set(CMAKE_C_SIZEOF_DATA_PTR "4") -set(CMAKE_C_COMPILER_ABI "ELF") -set(CMAKE_C_LIBRARY_ARCHITECTURE "") - -if(CMAKE_C_SIZEOF_DATA_PTR) - set(CMAKE_SIZEOF_VOID_P "${CMAKE_C_SIZEOF_DATA_PTR}") -endif() - -if(CMAKE_C_COMPILER_ABI) - set(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_C_COMPILER_ABI}") -endif() - -if(CMAKE_C_LIBRARY_ARCHITECTURE) - set(CMAKE_LIBRARY_ARCHITECTURE "") -endif() - -set(CMAKE_C_CL_SHOWINCLUDES_PREFIX "") -if(CMAKE_C_CL_SHOWINCLUDES_PREFIX) - set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_C_CL_SHOWINCLUDES_PREFIX}") -endif() - - - - -set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "dl;c;dl") -set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/9.0.8/lib/linux/i386;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib/gcc/i686-linux-android/4.9.x;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/22;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/i686-linux-android/lib;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib") -set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "") diff --git a/app/.cxx/cmake/debug/x86/CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake b/app/.cxx/cmake/debug/x86/CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake deleted file mode 100644 index 042d594..0000000 --- a/app/.cxx/cmake/debug/x86/CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake +++ /dev/null @@ -1,68 +0,0 @@ -set(CMAKE_CXX_COMPILER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++") -set(CMAKE_CXX_COMPILER_ARG1 "") -set(CMAKE_CXX_COMPILER_ID "Clang") -set(CMAKE_CXX_COMPILER_VERSION "9.0") -set(CMAKE_CXX_COMPILER_WRAPPER "") -set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT "14") -set(CMAKE_CXX_COMPILE_FEATURES "cxx_template_template_parameters;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates") -set(CMAKE_CXX98_COMPILE_FEATURES "cxx_template_template_parameters") -set(CMAKE_CXX11_COMPILE_FEATURES "cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates") -set(CMAKE_CXX14_COMPILE_FEATURES "cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates") - -set(CMAKE_CXX_PLATFORM_ID "") -set(CMAKE_CXX_SIMULATE_ID "") -set(CMAKE_CXX_SIMULATE_VERSION "") - -set(CMAKE_AR "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ar") -set(CMAKE_RANLIB "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ranlib") -set(CMAKE_LINKER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ld") -set(CMAKE_COMPILER_IS_GNUCXX ) -set(CMAKE_CXX_COMPILER_LOADED 1) -set(CMAKE_CXX_COMPILER_WORKS TRUE) -set(CMAKE_CXX_ABI_COMPILED TRUE) -set(CMAKE_COMPILER_IS_MINGW ) -set(CMAKE_COMPILER_IS_CYGWIN ) -if(CMAKE_COMPILER_IS_CYGWIN) - set(CYGWIN 1) - set(UNIX 1) -endif() - -set(CMAKE_CXX_COMPILER_ENV_VAR "CXX") - -if(CMAKE_COMPILER_IS_MINGW) - set(MINGW 1) -endif() -set(CMAKE_CXX_COMPILER_ID_RUN 1) -set(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC) -set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;mm;CPP) -set(CMAKE_CXX_LINKER_PREFERENCE 30) -set(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1) - -# Save compiler ABI information. -set(CMAKE_CXX_SIZEOF_DATA_PTR "4") -set(CMAKE_CXX_COMPILER_ABI "ELF") -set(CMAKE_CXX_LIBRARY_ARCHITECTURE "") - -if(CMAKE_CXX_SIZEOF_DATA_PTR) - set(CMAKE_SIZEOF_VOID_P "${CMAKE_CXX_SIZEOF_DATA_PTR}") -endif() - -if(CMAKE_CXX_COMPILER_ABI) - set(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_CXX_COMPILER_ABI}") -endif() - -if(CMAKE_CXX_LIBRARY_ARCHITECTURE) - set(CMAKE_LIBRARY_ARCHITECTURE "") -endif() - -set(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX "") -if(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX) - set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_CXX_CL_SHOWINCLUDES_PREFIX}") -endif() - - - - -set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "c++;m;dl;c;dl") -set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/9.0.8/lib/linux/i386;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib/gcc/i686-linux-android/4.9.x;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/22;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/i686-linux-android/lib;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib") -set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "") diff --git a/app/.cxx/cmake/debug/x86/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin b/app/.cxx/cmake/debug/x86/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin deleted file mode 100755 index 6d94711..0000000 Binary files a/app/.cxx/cmake/debug/x86/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin and /dev/null differ diff --git a/app/.cxx/cmake/debug/x86/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin b/app/.cxx/cmake/debug/x86/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin deleted file mode 100755 index 303ae8c..0000000 Binary files a/app/.cxx/cmake/debug/x86/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin and /dev/null differ diff --git a/app/.cxx/cmake/debug/x86/CMakeFiles/3.6.0-rc2/CMakeSystem.cmake b/app/.cxx/cmake/debug/x86/CMakeFiles/3.6.0-rc2/CMakeSystem.cmake deleted file mode 100644 index ac531bf..0000000 --- a/app/.cxx/cmake/debug/x86/CMakeFiles/3.6.0-rc2/CMakeSystem.cmake +++ /dev/null @@ -1,15 +0,0 @@ -set(CMAKE_HOST_SYSTEM "Linux-4.15.0-112-generic") -set(CMAKE_HOST_SYSTEM_NAME "Linux") -set(CMAKE_HOST_SYSTEM_VERSION "4.15.0-112-generic") -set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64") - -include("/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake") - -set(CMAKE_SYSTEM "Android-1") -set(CMAKE_SYSTEM_NAME "Android") -set(CMAKE_SYSTEM_VERSION "1") -set(CMAKE_SYSTEM_PROCESSOR "i686") - -set(CMAKE_CROSSCOMPILING "TRUE") - -set(CMAKE_SYSTEM_LOADED 1) diff --git a/app/.cxx/cmake/debug/x86/CMakeFiles/TargetDirectories.txt b/app/.cxx/cmake/debug/x86/CMakeFiles/TargetDirectories.txt index ef77364..dc98918 100644 --- a/app/.cxx/cmake/debug/x86/CMakeFiles/TargetDirectories.txt +++ b/app/.cxx/cmake/debug/x86/CMakeFiles/TargetDirectories.txt @@ -1,3 +1,3 @@ -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86/CMakeFiles/rebuild_cache.dir -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86/CMakeFiles/edit_cache.dir -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86/CMakeFiles/djivideojni.dir +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86/CMakeFiles/rebuild_cache.dir +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86/CMakeFiles/edit_cache.dir +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86/CMakeFiles/djivideojni.dir diff --git a/app/.cxx/cmake/debug/x86/CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o b/app/.cxx/cmake/debug/x86/CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o index 3678d29..294f4a0 100644 Binary files a/app/.cxx/cmake/debug/x86/CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o and b/app/.cxx/cmake/debug/x86/CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o differ diff --git a/app/.cxx/cmake/debug/x86/CMakeFiles/feature_tests.bin b/app/.cxx/cmake/debug/x86/CMakeFiles/feature_tests.bin index 9589152..bcf9b8f 100755 Binary files a/app/.cxx/cmake/debug/x86/CMakeFiles/feature_tests.bin and b/app/.cxx/cmake/debug/x86/CMakeFiles/feature_tests.bin differ diff --git a/app/.cxx/cmake/debug/x86/CMakeFiles/feature_tests.cxx b/app/.cxx/cmake/debug/x86/CMakeFiles/feature_tests.cxx index a9b4791..703b335 100644 --- a/app/.cxx/cmake/debug/x86/CMakeFiles/feature_tests.cxx +++ b/app/.cxx/cmake/debug/x86/CMakeFiles/feature_tests.cxx @@ -1,35 +1,35 @@ const char features[] = {"\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_aggregate_nsdmi) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_aggregate_nsdmi) "1" #else "0" #endif "cxx_aggregate_default_initializers\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_alias_templates) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_alias_templates) "1" #else "0" #endif "cxx_alias_templates\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_alignas) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_alignas) "1" #else "0" #endif "cxx_alignas\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_alignas) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_alignas) "1" #else "0" #endif "cxx_alignof\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_attributes) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_attributes) "1" #else "0" @@ -43,35 +43,35 @@ #endif "cxx_attribute_deprecated\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_auto_type) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_auto_type) "1" #else "0" #endif "cxx_auto_type\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_binary_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_binary_literals) "1" #else "0" #endif "cxx_binary_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_constexpr) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_constexpr) "1" #else "0" #endif "cxx_constexpr\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_contextual_conversions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_contextual_conversions) "1" #else "0" #endif "cxx_contextual_conversions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_decltype) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_decltype) "1" #else "0" @@ -85,42 +85,42 @@ #endif "cxx_decltype_auto\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_decltype_incomplete_return_types) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_decltype_incomplete_return_types) "1" #else "0" #endif "cxx_decltype_incomplete_return_types\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_default_function_template_args) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_default_function_template_args) "1" #else "0" #endif "cxx_default_function_template_args\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_defaulted_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_defaulted_functions) "1" #else "0" #endif "cxx_defaulted_functions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_defaulted_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_defaulted_functions) "1" #else "0" #endif "cxx_defaulted_move_initializers\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_delegating_constructors) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_delegating_constructors) "1" #else "0" #endif "cxx_delegating_constructors\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_deleted_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_deleted_functions) "1" #else "0" @@ -134,49 +134,49 @@ #endif "cxx_digit_separators\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_enum_forward_declarations\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_explicit_conversions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_explicit_conversions) "1" #else "0" #endif "cxx_explicit_conversions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_extended_friend_declarations\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_extern_templates\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_override_control) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_override_control) "1" #else "0" #endif "cxx_final\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_func_identifier\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_generalized_initializers) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_generalized_initializers) "1" #else "0" @@ -190,210 +190,210 @@ #endif "cxx_generic_lambdas\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_inheriting_constructors) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_inheriting_constructors) "1" #else "0" #endif "cxx_inheriting_constructors\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_inline_namespaces\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_lambdas) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_lambdas) "1" #else "0" #endif "cxx_lambdas\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_init_captures) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_init_captures) "1" #else "0" #endif "cxx_lambda_init_captures\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_local_type_template_args) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_local_type_template_args) "1" #else "0" #endif "cxx_local_type_template_args\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_long_long_type\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_noexcept) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_noexcept) "1" #else "0" #endif "cxx_noexcept\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_nonstatic_member_init) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_nonstatic_member_init) "1" #else "0" #endif "cxx_nonstatic_member_init\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_nullptr) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_nullptr) "1" #else "0" #endif "cxx_nullptr\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_override_control) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_override_control) "1" #else "0" #endif "cxx_override\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_range_for) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_range_for) "1" #else "0" #endif "cxx_range_for\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_raw_string_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_raw_string_literals) "1" #else "0" #endif "cxx_raw_string_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_reference_qualified_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_reference_qualified_functions) "1" #else "0" #endif "cxx_reference_qualified_functions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_relaxed_constexpr) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_relaxed_constexpr) "1" #else "0" #endif "cxx_relaxed_constexpr\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_return_type_deduction) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_return_type_deduction) "1" #else "0" #endif "cxx_return_type_deduction\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_right_angle_brackets\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_rvalue_references) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_rvalue_references) "1" #else "0" #endif "cxx_rvalue_references\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_sizeof_member\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_static_assert) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_static_assert) "1" #else "0" #endif "cxx_static_assert\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_strong_enums) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_strong_enums) "1" #else "0" #endif "cxx_strong_enums\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 199711L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 199711L "1" #else "0" #endif "cxx_template_template_parameters\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_thread_local) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_thread_local) "1" #else "0" #endif "cxx_thread_local\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_trailing_return) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_trailing_return) "1" #else "0" #endif "cxx_trailing_return_types\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_unicode_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_unicode_literals) "1" #else "0" #endif "cxx_unicode_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_generalized_initializers) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_generalized_initializers) "1" #else "0" #endif "cxx_uniform_initialization\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_unrestricted_unions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_unrestricted_unions) "1" #else "0" #endif "cxx_unrestricted_unions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_user_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_user_literals) "1" #else "0" #endif "cxx_user_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_variable_templates) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_variable_templates) "1" #else "0" #endif "cxx_variable_templates\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_variadic_macros\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_variadic_templates) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_variadic_templates) "1" #else "0" diff --git a/app/.cxx/cmake/debug/x86/android_gradle_build.json b/app/.cxx/cmake/debug/x86/android_gradle_build.json index 4282538..e54f174 100644 --- a/app/.cxx/cmake/debug/x86/android_gradle_build.json +++ b/app/.cxx/cmake/debug/x86/android_gradle_build.json @@ -1,65 +1,45 @@ - { - "buildFiles" : - [ - "/home/smartdrone/Working_Private/rosettadrone_work/app/CMakeLists.txt" - ], - "cFileExtensions" : [ "c" ], - "cleanCommands" : - [ - "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86 --target clean" - ], - "libraries" : - { - "c++_shared-Debug-x86" : - { - "abi" : "x86", - "artifactName" : "c++_shared", - "buildType" : "debug", - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/x86/libc++_shared.so.27", - "toolchain" : "6038786665986016389" - }, - "djivideojni-Debug-x86" : - { - "abi" : "x86", - "artifactName" : "djivideojni", - "buildCommand" : "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86 --target djivideojni", - "buildType" : "debug", - "files" : - [ - - { - "flags" : " --target=i686-none-linux-android22 --gcc-toolchain=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64 --sysroot=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot -Ddjivideojni_EXPORTS -I../../../../src/main/cpp -I../../../../src/main/cpp/include -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/gstreamer-1.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/glib-2.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/lib/glib-2.0/include -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -mstackrealign -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O0 -fno-limit-debug-info -fPIC -c ", - "src" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/dji_video_jni.c", - "workingDirectory" : "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86" - } - ], - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj/x86/libdjivideojni.so", - "toolchain" : "6038786665986016389" - }, - "ffmpegjni-Debug-x86" : - { - "abi" : "x86", - "artifactName" : "ffmpegjni", - "buildType" : "debug", - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/x86/libffmpeg.so", - "toolchain" : "6038786665986016389" - }, - "gstreamer_android-Debug-x86" : - { - "abi" : "x86", - "artifactName" : "gstreamer_android", - "buildType" : "debug", - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/x86/libgstreamer_android.so", - "toolchain" : "6038786665986016389" - } - }, - "toolchains" : - { - "6038786665986016389" : - { - "cCompilerExecutable" : "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang", - "cppCompilerExecutable" : "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++" - } - } -} + "stringTable": { + "0": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86", + "1": "--target=i686-none-linux-android22 --gcc-toolchain=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64 --sysroot=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -Ddjivideojni_EXPORTS -I../../../../src/main/cpp -I../../../../src/main/cpp/include -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/gstreamer-1.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/glib-2.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/lib/glib-2.0/include -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -mstackrealign -fno-addrsig -Wa,--noexecstack -Wformat -Werror=format-security -O0 -fno-limit-debug-info -fPIC" + }, + "buildFiles": [ + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake" + ], + "cleanCommands": [ + "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86\" clean" + ], + "buildTargetsCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86\" {LIST_OF_TARGETS_TO_BUILD}", + "libraries": { + "djivideojni-Debug-x86": { + "buildCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86\" djivideojni", + "buildType": "debug", + "toolchain": "3669181217", + "abi": "x86", + "artifactName": "djivideojni", + "files": [ + { + "src": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/src/main/cpp/dji_video_jni.c", + "flagsOrdinal": 1, + "workingDirectoryOrdinal": 0 + } + ], + "headers": [], + "output": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/debug/obj/x86/libdjivideojni.so", + "runtimeFiles": [ + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/src/main/cpp/lib/x86/libffmpeg.so" + ] + } + }, + "toolchains": { + "3669181217": { + "cCompilerExecutable": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang" + } + }, + "cFileExtensions": [ + "c" + ], + "cppFileExtensions": [] +} \ No newline at end of file diff --git a/app/.cxx/cmake/debug/x86/android_gradle_build_djivideojni_x86.command.txt b/app/.cxx/cmake/debug/x86/android_gradle_build_djivideojni_x86.command.txt index 3157300..1b2722a 100644 --- a/app/.cxx/cmake/debug/x86/android_gradle_build_djivideojni_x86.command.txt +++ b/app/.cxx/cmake/debug/x86/android_gradle_build_djivideojni_x86.command.txt @@ -1,8 +1,7 @@ -Executable : /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake +Executable : /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja arguments : ---build -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86 ---target +-C +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86 djivideojni jvmArgs : diff --git a/app/.cxx/cmake/debug/x86/android_gradle_build_djivideojni_x86.stdout.txt b/app/.cxx/cmake/debug/x86/android_gradle_build_djivideojni_x86.stdout.txt index 964c94d..aa187b8 100644 --- a/app/.cxx/cmake/debug/x86/android_gradle_build_djivideojni_x86.stdout.txt +++ b/app/.cxx/cmake/debug/x86/android_gradle_build_djivideojni_x86.stdout.txt @@ -1 +1,22 @@ -ninja: no work to do. +ninja: Entering directory `/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86' +[1/2] Building C object CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o +In file included from ../../../../src/main/cpp/dji_video_jni.c:4: +In file included from ../../../../src/main/cpp/ffmpeg.h:34: +In file included from ../../../../src/main/cpp/cmdutils.h:28: +In file included from ../../../../src/main/cpp/include/libavcodec/avcodec.h:31: +In file included from ../../../../src/main/cpp/include/libavutil/samplefmt.h:24: +In file included from ../../../../src/main/cpp/include/libavutil/avutil.h:289: +In file included from ../../../../src/main/cpp/include/libavutil/common.h:401: +In file included from ../../../../src/main/cpp/include/libavutil/mem.h:33: +../../../../src/main/cpp/include/libavutil/error.h:121:5: warning: non-constant static local variable in inline function may be different in different files [-Wstatic-local-in-inline] + static char str[AV_ERROR_MAX_STRING_SIZE]; + ^ +../../../../src/main/cpp/include/libavutil/error.h:119:1: note: use 'static' to give inline function 'av_err2str' internal linkage +av_always_inline char *av_err2str(int errnum) { +^ +static +../../../../src/main/cpp/include/libavutil/attributes.h:37:30: note: expanded from macro 'av_always_inline' +# define av_always_inline __attribute__((always_inline)) inline + ^ +1 warning generated. +[2/2] Linking C shared library ../../../../build/intermediates/cmake/debug/obj/x86/libdjivideojni.so diff --git a/app/.cxx/cmake/debug/x86/android_gradle_build_mini.json b/app/.cxx/cmake/debug/x86/android_gradle_build_mini.json index eb0f6be..d8bd46a 100644 --- a/app/.cxx/cmake/debug/x86/android_gradle_build_mini.json +++ b/app/.cxx/cmake/debug/x86/android_gradle_build_mini.json @@ -1,31 +1,22 @@ { "buildFiles": [ - "/home/smartdrone/Working_Private/rosettadrone_work/app/CMakeLists.txt" + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake" ], "cleanCommands": [ - "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86 --target clean" + "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86\" clean" ], + "buildTargetsCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86\" {LIST_OF_TARGETS_TO_BUILD}", "libraries": { - "gstreamer_android-Debug-x86": { - "artifactName": "gstreamer_android", - "abi": "x86", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/x86/libgstreamer_android.so" - }, "djivideojni-Debug-x86": { "artifactName": "djivideojni", - "buildCommand": "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86 --target djivideojni", + "buildCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86\" djivideojni", "abi": "x86", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj/x86/libdjivideojni.so" - }, - "c++_shared-Debug-x86": { - "artifactName": "c++_shared", - "abi": "x86", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/x86/libc++_shared.so.27" - }, - "ffmpegjni-Debug-x86": { - "artifactName": "ffmpegjni", - "abi": "x86", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/x86/libffmpeg.so" + "output": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/debug/obj/x86/libdjivideojni.so", + "runtimeFiles": [ + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/src/main/cpp/lib/x86/libffmpeg.so" + ] } } } \ No newline at end of file diff --git a/app/.cxx/cmake/debug/x86/android_gradle_generate_cmake_ninja_json_x86.command.txt b/app/.cxx/cmake/debug/x86/android_gradle_generate_cmake_ninja_json_x86.command.txt deleted file mode 100644 index 21592a8..0000000 --- a/app/.cxx/cmake/debug/x86/android_gradle_generate_cmake_ninja_json_x86.command.txt +++ /dev/null @@ -1,14 +0,0 @@ -Executable : /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -arguments : --H/home/smartdrone/Working_Private/rosettadrone_work/app --B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86 --DANDROID_ABI=x86 --DANDROID_PLATFORM=android-22 --DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj/x86 --DCMAKE_BUILD_TYPE=Debug --DANDROID_NDK=/home/smartdrone/Android/Sdk/ndk/21.3.6528147 --DCMAKE_TOOLCHAIN_FILE=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake --DCMAKE_MAKE_PROGRAM=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja --GAndroid Gradle - Ninja -jvmArgs : - diff --git a/app/.cxx/cmake/debug/x86/android_gradle_generate_cmake_ninja_json_x86.stderr.txt b/app/.cxx/cmake/debug/x86/android_gradle_generate_cmake_ninja_json_x86.stderr.txt deleted file mode 100644 index e69de29..0000000 diff --git a/app/.cxx/cmake/debug/x86/android_gradle_generate_cmake_ninja_json_x86.stdout.txt b/app/.cxx/cmake/debug/x86/android_gradle_generate_cmake_ninja_json_x86.stdout.txt deleted file mode 100644 index 3e5c2e2..0000000 --- a/app/.cxx/cmake/debug/x86/android_gradle_generate_cmake_ninja_json_x86.stdout.txt +++ /dev/null @@ -1,15 +0,0 @@ --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -- works --- Detecting C compiler ABI info --- Detecting C compiler ABI info - done --- Detecting C compile features --- Detecting C compile features - done --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -- works --- Detecting CXX compiler ABI info --- Detecting CXX compiler ABI info - done --- Detecting CXX compile features --- Detecting CXX compile features - done --- Configuring done --- Generating done --- Build files have been written to: /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86 diff --git a/app/.cxx/cmake/debug/x86/build.ninja b/app/.cxx/cmake/debug/x86/build.ninja index 60b1e98..e639ce6 100644 --- a/app/.cxx/cmake/debug/x86/build.ninja +++ b/app/.cxx/cmake/debug/x86/build.ninja @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Ninja" Generator, CMake Version 3.6 +# Generated by "Ninja" Generator, CMake Version 3.10 # This file contains all the build statements describing the # compilation DAG. @@ -34,7 +34,7 @@ include rules.ninja # Utility command for rebuild_cache build CMakeFiles/rebuild_cache.util: CUSTOM_COMMAND - COMMAND = cd /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86 && /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -H/home/smartdrone/Working_Private/rosettadrone_work/app -B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86 + COMMAND = cd /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86 && /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake -H/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app -B/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86 DESC = Running CMake to regenerate build system... pool = console restat = 1 @@ -44,19 +44,23 @@ build rebuild_cache: phony CMakeFiles/rebuild_cache.util # Utility command for edit_cache build CMakeFiles/edit_cache.util: CUSTOM_COMMAND - COMMAND = cd /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86 && /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. + COMMAND = cd /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86 && /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. DESC = No interactive CMake dialog available... restat = 1 build edit_cache: phony CMakeFiles/edit_cache.util # ============================================================================= # Object build statements for SHARED_LIBRARY target djivideojni -build CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o: C_COMPILER__djivideojni ../../../../src/main/cpp/dji_video_jni.c + +############################################# +# Order-only phony target for djivideojni + +build cmake_object_order_depends_target_djivideojni: phony +build CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o: C_COMPILER__djivideojni ../../../../src/main/cpp/dji_video_jni.c || cmake_object_order_depends_target_djivideojni DEFINES = -Ddjivideojni_EXPORTS DEP_FILE = CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o.d - FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -mstackrealign -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O0 -fno-limit-debug-info -fPIC + FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -mstackrealign -fno-addrsig -Wa,--noexecstack -Wformat -Werror=format-security -O0 -fno-limit-debug-info -fPIC INCLUDES = -I../../../../src/main/cpp -I../../../../src/main/cpp/include -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/gstreamer-1.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/glib-2.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/lib/glib-2.0/include - IN_ABS = /home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/dji_video_jni.c OBJECT_DIR = CMakeFiles/djivideojni.dir OBJECT_FILE_DIR = CMakeFiles/djivideojni.dir/src/main/cpp @@ -67,10 +71,10 @@ build CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o: C_COMPILER__dji ############################################# # Link the shared library ../../../../build/intermediates/cmake/debug/obj/x86/libdjivideojni.so -build ../../../../build/intermediates/cmake/debug/obj/x86/libdjivideojni.so: C_SHARED_LIBRARY_LINKER__djivideojni CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o | ../../../../src/main/cpp/lib/x86/libffmpeg.so /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/22/liblog.so - LANGUAGE_COMPILE_FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -mstackrealign -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O0 -fno-limit-debug-info - LINK_FLAGS = -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libgcc_real.a -Wl,--exclude-libs,libatomic.a -static-libstdc++ -Wl,--build-id -Wl,--fatal-warnings -Wl,--no-undefined -Qunused-arguments - LINK_LIBRARIES = ../../../../src/main/cpp/lib/x86/libffmpeg.so /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/22/liblog.so -latomic -lm +build ../../../../build/intermediates/cmake/debug/obj/x86/libdjivideojni.so: C_SHARED_LIBRARY_LINKER__djivideojni CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o | ../../../../src/main/cpp/lib/x86/libffmpeg.so /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/i686-linux-android/22/liblog.so + LANGUAGE_COMPILE_FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -mstackrealign -fno-addrsig -Wa,--noexecstack -Wformat -Werror=format-security -O0 -fno-limit-debug-info + LINK_FLAGS = -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -static-libstdc++ -Wl,--build-id -Wl,--warn-shared-textrel -Wl,--fatal-warnings -Wl,--no-undefined -Qunused-arguments -Wl,-z,noexecstack + LINK_LIBRARIES = ../../../../src/main/cpp/lib/x86/libffmpeg.so -llog -latomic -lm OBJECT_DIR = CMakeFiles/djivideojni.dir POST_BUILD = : PRE_LINK = : @@ -104,13 +108,13 @@ default all ############################################# # Re-run CMake if any of its inputs changed. -build build.ninja: RERUN_CMAKE | ../../../../CMakeLists.txt /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompilerABI.c /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompilerABI.cpp /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCommonLanguageInclude.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompileFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompilerABI.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeFindBinUtils.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeGenericSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeLanguageInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeParseImplicitLinkInfo.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystem.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInitialize.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCompilerCommon.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/GNU.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Internal/FeatureTesting.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Android.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Linux.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/UnixPaths.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/platforms.cmake CMakeCache.txt CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx +build build.ninja: RERUN_CMAKE | ../../../../CMakeLists.txt /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompilerABI.c /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompilerABI.cpp /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCommonLanguageInclude.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompileFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompilerABI.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeFindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeGenericSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeLanguageInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeParseImplicitLinkInfo.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystem.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInitialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCompilerCommon.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/CMakeCommonCompilerMacros.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-FindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/GNU.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Internal/FeatureTesting.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Initialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android/Determine-Compiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Linux.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/UnixPaths.cmake CMakeCache.txt CMakeFiles/3.10.2/CMakeCCompiler.cmake CMakeFiles/3.10.2/CMakeCXXCompiler.cmake CMakeFiles/3.10.2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx pool = console ############################################# # A missing CMake input file is not an error. -build ../../../../CMakeLists.txt /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompilerABI.c /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompilerABI.cpp /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCommonLanguageInclude.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompileFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompilerABI.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeFindBinUtils.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeGenericSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeLanguageInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeParseImplicitLinkInfo.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystem.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInitialize.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCompilerCommon.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/GNU.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Internal/FeatureTesting.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Android.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Linux.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/UnixPaths.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/platforms.cmake CMakeCache.txt CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx: phony +build ../../../../CMakeLists.txt /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompilerABI.c /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompilerABI.cpp /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCommonLanguageInclude.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompileFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompilerABI.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeFindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeGenericSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeLanguageInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeParseImplicitLinkInfo.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystem.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInitialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCompilerCommon.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/CMakeCommonCompilerMacros.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-FindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/GNU.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Internal/FeatureTesting.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Initialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android/Determine-Compiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Linux.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/UnixPaths.cmake CMakeCache.txt CMakeFiles/3.10.2/CMakeCCompiler.cmake CMakeFiles/3.10.2/CMakeCXXCompiler.cmake CMakeFiles/3.10.2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx: phony ############################################# # Clean all the built files. diff --git a/app/.cxx/cmake/debug/x86/build_command.txt b/app/.cxx/cmake/debug/x86/build_command.txt index 21592a8..b4d0f40 100644 --- a/app/.cxx/cmake/debug/x86/build_command.txt +++ b/app/.cxx/cmake/debug/x86/build_command.txt @@ -1,14 +1,21 @@ -Executable : /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake + Executable : /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake arguments : --H/home/smartdrone/Working_Private/rosettadrone_work/app --B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86 --DANDROID_ABI=x86 --DANDROID_PLATFORM=android-22 --DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj/x86 +-H/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app +-DCMAKE_FIND_ROOT_PATH=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/prefab/x86/prefab -DCMAKE_BUILD_TYPE=Debug --DANDROID_NDK=/home/smartdrone/Android/Sdk/ndk/21.3.6528147 --DCMAKE_TOOLCHAIN_FILE=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake --DCMAKE_MAKE_PROGRAM=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja --GAndroid Gradle - Ninja +-DCMAKE_TOOLCHAIN_FILE=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake +-DANDROID_ABI=x86 +-DANDROID_NDK=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 +-DANDROID_PLATFORM=android-22 +-DCMAKE_ANDROID_ARCH_ABI=x86 +-DCMAKE_ANDROID_NDK=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 +-DCMAKE_EXPORT_COMPILE_COMMANDS=ON +-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/debug/obj/x86 +-DCMAKE_MAKE_PROGRAM=/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja +-DCMAKE_SYSTEM_NAME=Android +-DCMAKE_SYSTEM_VERSION=22 +-B/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86 +-GNinja jvmArgs : +Build command args: diff --git a/app/.cxx/cmake/debug/x86/build_model.json b/app/.cxx/cmake/debug/x86/build_model.json index 3f1e721..9cced03 100644 --- a/app/.cxx/cmake/debug/x86/build_model.json +++ b/app/.cxx/cmake/debug/x86/build_model.json @@ -1,69 +1,203 @@ { - "variant": { - "module": { - "rootBuildGradleFolder": "/home/smartdrone/Working_Private/rosettadrone_work", - "sdkFolder": "/home/smartdrone/Android/Sdk", - "isNativeCompilerSettingsCacheEnabled": false, - "isBuildOnlyTargetAbiEnabled": true, - "splitsAbiFilterSet": [], - "intermediatesFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates", - "gradleModulePathName": ":app", - "moduleRootFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app", - "makeFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/CMakeLists.txt", - "buildSystem": "CMAKE", - "compilerSettingsCacheFolder": "/home/smartdrone/Working_Private/rosettadrone_work/.cxx", - "cxxFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx", - "ndkFolder": "/home/smartdrone/Android/Sdk/ndk/21.3.6528147", - "ndkVersion": "21.3.6528147", - "ndkSupportedAbiList": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" + "abi": "X86", + "abiPlatformVersion": 22, + "buildSettings": { + "environmentVariables": [] + }, + "cmake": { + "cmakeArtifactsBaseFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86", + "cmakeServerLogFile": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86/cmake_server_log.txt", + "cmakeWrappingBaseFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cxx/debug/x86", + "effectiveConfiguration": { + "name": "traditional-android-studio-cmake-environment", + "description": "Composite reified CMakeSettings configuration", + "generator": "Ninja", + "inheritEnvironments": [ + "ndk" ], + "buildRoot": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86", + "cmakeToolchain": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "cmakeExecutable": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake", + "variables": [ + { + "name": "CMAKE_FIND_ROOT_PATH", + "value": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/prefab/x86/prefab" + }, + { + "name": "CMAKE_BUILD_TYPE", + "value": "Debug" + }, + { + "name": "CMAKE_TOOLCHAIN_FILE", + "value": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake" + }, + { + "name": "ANDROID_ABI", + "value": "x86" + }, + { + "name": "ANDROID_NDK", + "value": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944" + }, + { + "name": "ANDROID_PLATFORM", + "value": "android-22" + }, + { + "name": "CMAKE_ANDROID_ARCH_ABI", + "value": "x86" + }, + { + "name": "CMAKE_ANDROID_NDK", + "value": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944" + }, + { + "name": "CMAKE_EXPORT_COMPILE_COMMANDS", + "value": "ON" + }, + { + "name": "CMAKE_LIBRARY_OUTPUT_DIRECTORY", + "value": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/debug/obj/x86" + }, + { + "name": "CMAKE_MAKE_PROGRAM", + "value": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja" + }, + { + "name": "CMAKE_SYSTEM_NAME", + "value": "Android" + }, + { + "name": "CMAKE_SYSTEM_VERSION", + "value": "22" + } + ] + } + }, + "cxxBuildFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86", + "info": { + "abi": "X86", + "bitness": 32, + "deprecated": false, + "default": true + }, + "originalCxxBuildFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86", + "variant": { + "buildSystemArgumentList": [], + "buildTargetSet": [], + "implicitBuildTargetSet": [], + "cFlagsList": [], + "cmakeSettingsConfiguration": "android-gradle-plugin-predetermined-name", + "cppFlagsList": [], + "isDebuggableEnabled": true, + "module": { + "buildSystem": "CMAKE", + "cmake": { + "cmakeExe": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake", + "minimumCmakeVersion": "3.10.2", + "ninjaExe": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja" + }, + "cmakeToolchainFile": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "cxxFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx", + "gradleModulePathName": ":app", + "intermediatesFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates", + "makeFile": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "moduleBuildFile": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build.gradle", + "moduleRootFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app", "ndkDefaultAbiList": [ "ARMEABI_V7A", "ARM64_V8A", "X86", "X86_64" ], - "cmakeToolchainFile": "." + "ndkFolder": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944", + "ndkMetaAbiList": [ + { + "abi": "ARMEABI_V7A", + "bitness": 32, + "deprecated": false, + "default": true + }, + { + "abi": "ARM64_V8A", + "bitness": 64, + "deprecated": false, + "default": true + }, + { + "abi": "X86", + "bitness": 32, + "deprecated": false, + "default": true + }, + { + "abi": "X86_64", + "bitness": 64, + "deprecated": false, + "default": true + } + ], + "ndkMetaPlatforms": { + "min": 16, + "max": 29, + "aliases": { + "20": 19, + "25": 24, + "J": 16, + "J-MR1": 17, + "J-MR2": 18, + "K": 19, + "L": 21, + "L-MR1": 22, + "M": 23, + "N": 24, + "N-MR1": 24, + "O": 26, + "O-MR1": 27, + "P": 28, + "Q": 29 + } + }, + "ndkSupportedAbiList": [ + "ARMEABI_V7A", + "ARM64_V8A", + "X86", + "X86_64" + ], + "ndkDefaultStl": "LIBCXX_STATIC", + "ndkVersion": "20.1.5948944", + "project": { + "compilerSettingsCacheFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/.cxx", + "cxxFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/.cxx", + "isBuildOnlyTargetAbiEnabled": true, + "isCmakeBuildCohabitationEnabled": false, + "isNativeCompilerSettingsCacheEnabled": false, + "rootBuildGradleFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work", + "sdkFolder": "/Users/teni/Library/Android/sdk", + "isPrefabEnabled": false + }, + "splitsAbiFilterSet": [], + "stlSharedObjectMap": { + "LIBCXX_SHARED": { + "ARMEABI_V7A": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi/libc++_shared.so", + "ARM64_V8A": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so", + "X86": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/i686-linux-android/libc++_shared.so", + "X86_64": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/x86_64-linux-android/libc++_shared.so" + }, + "LIBCXX_STATIC": {}, + "NONE": {}, + "SYSTEM": {} + } }, - "buildSystemArgumentList": [], - "cFlagList": [], - "cppFlagsList": [], + "objFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/debug/obj", "variantName": "debug", - "soFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/lib", - "objFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj", - "jsonFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug", - "gradleBuildOutputFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug", - "isDebuggableEnabled": true, "validAbiList": [ "ARMEABI_V7A", "ARM64_V8A", "X86" ], - "buildTargetSet": [] + "prefabDirectory": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/prefab", + "prefabPackageDirectoryList": [] }, - "abi": "X86", - "abiPlatformVersion": 22, - "cxxBuildFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86", - "jsonFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86/android_gradle_build.json", - "gradleBuildOutputFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/x86", - "objFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/debug/obj/x86", - "buildCommandFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86/build_command.txt", - "buildOutputFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86/build_output.txt", - "modelOutputFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86/build_model.json", - "cmake": { - "cmakeListsWrapperFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/x86/CMakeLists.txt", - "toolchainWrapperFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/x86/android_gradle_build.toolchain.cmake", - "buildGenerationStateFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/x86/build_generation_state.json", - "cacheKeyFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/x86/compiler_cache_key.json", - "compilerCacheUseFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/x86/compiler_cache_use.json", - "compilerCacheWriteFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/x86/compiler_cache_write.json", - "toolchainSettingsFromCacheFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/debug/x86/compiler_settings_cache.cmake", - "cmakeWrappingBaseFolder": "." - }, - "jsonGenerationLoggingRecordFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86/json_generation_record.json", - "compileCommandsJsonFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86/compile_commands.json" + "prefabFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/prefab/x86" } \ No newline at end of file diff --git a/app/.cxx/cmake/debug/x86/build_output.txt b/app/.cxx/cmake/debug/x86/build_output.txt index c6d0a23..bc40114 100644 --- a/app/.cxx/cmake/debug/x86/build_output.txt +++ b/app/.cxx/cmake/debug/x86/build_output.txt @@ -1,15 +1,13 @@ --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -- works --- Detecting C compiler ABI info --- Detecting C compiler ABI info - done --- Detecting C compile features --- Detecting C compile features - done --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -- works --- Detecting CXX compiler ABI info --- Detecting CXX compiler ABI info - done --- Detecting CXX compile features --- Detecting CXX compile features - done --- Configuring done --- Generating done --- Build files have been written to: /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86 \ No newline at end of file +Check for working C compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang +Check for working C compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang -- works +Detecting C compiler ABI info +Detecting C compiler ABI info - done +Detecting C compile features +Detecting C compile features - done +Check for working CXX compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ +Check for working CXX compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ -- works +Detecting CXX compiler ABI info +Detecting CXX compiler ABI info - done +Detecting CXX compile features +Detecting CXX compile features - done +Configuring done \ No newline at end of file diff --git a/app/.cxx/cmake/debug/x86/cmake_install.cmake b/app/.cxx/cmake/debug/x86/cmake_install.cmake index e69bc41..019c4f6 100644 --- a/app/.cxx/cmake/debug/x86/cmake_install.cmake +++ b/app/.cxx/cmake/debug/x86/cmake_install.cmake @@ -1,4 +1,4 @@ -# Install script for directory: /home/smartdrone/Working_Private/rosettadrone_work/app +# Install script for directory: /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app # Set the install prefix if(NOT DEFINED CMAKE_INSTALL_PREFIX) @@ -29,7 +29,12 @@ endif() # Install shared libraries without execute permission? if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) - set(CMAKE_INSTALL_SO_NO_EXE "1") + set(CMAKE_INSTALL_SO_NO_EXE "0") +endif() + +# Is this installation the result of a crosscompile? +if(NOT DEFINED CMAKE_CROSSCOMPILING) + set(CMAKE_CROSSCOMPILING "TRUE") endif() if(CMAKE_INSTALL_COMPONENT) @@ -40,5 +45,5 @@ endif() string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT "${CMAKE_INSTALL_MANIFEST_FILES}") -file(WRITE "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86/${CMAKE_INSTALL_MANIFEST}" +file(WRITE "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86/${CMAKE_INSTALL_MANIFEST}" "${CMAKE_INSTALL_MANIFEST_CONTENT}") diff --git a/app/.cxx/cmake/debug/x86/json_generation_record.json b/app/.cxx/cmake/debug/x86/json_generation_record.json index 4a82863..0526a36 100644 --- a/app/.cxx/cmake/debug/x86/json_generation_record.json +++ b/app/.cxx/cmake/debug/x86/json_generation_record.json @@ -1,14 +1,44 @@ [ { "level": "INFO", - "message": "Start JSON generation. Platform version: 22 min SDK version: x86" + "message": "Start JSON generation. Platform version: 22 min SDK version: x86", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|x86" }, { "level": "INFO", - "message": "JSON \u0027/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86/android_gradle_build.json\u0027 was up-to-date" + "message": "No CMake version was specified in build.gradle. Using default version 3.10.2.", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|x86" }, { "level": "INFO", - "message": "JSON generation completed without problems" + "message": "Trying to locate CMake in local SDK repository.", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|x86" + }, + { + "level": "INFO", + "message": "- CMake found in SDK at \u0027/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404\u0027 had version \u00273.10.2\u0027", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|x86" + }, + { + "level": "INFO", + "message": "CMake \u00273.6.0\u0027 found in SDK did not match requested version \u00273.10.2\u0027.", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|x86" + }, + { + "level": "INFO", + "message": "JSON \u0027/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86/android_gradle_build.json\u0027 was up-to-date", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|x86" + }, + { + "level": "INFO", + "message": "JSON generation completed without problems", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "debug|x86" } ] \ No newline at end of file diff --git a/app/.cxx/cmake/debug/x86/rules.ninja b/app/.cxx/cmake/debug/x86/rules.ninja index f8ddfef..8995524 100644 --- a/app/.cxx/cmake/debug/x86/rules.ninja +++ b/app/.cxx/cmake/debug/x86/rules.ninja @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Ninja" Generator, CMake Version 3.6 +# Generated by "Ninja" Generator, CMake Version 3.10 # This file contains all the rules used to get the outputs files # built from the input files. @@ -25,7 +25,7 @@ rule CUSTOM_COMMAND rule C_COMPILER__djivideojni depfile = $DEP_FILE deps = gcc - command = /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=i686-none-linux-android22 --gcc-toolchain=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64 --sysroot=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot $DEFINES $INCLUDES $FLAGS -MD -MT $out -MF $DEP_FILE -o $out -c $IN_ABS + command = /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang --target=i686-none-linux-android22 --gcc-toolchain=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64 --sysroot=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot $DEFINES $INCLUDES $FLAGS -MD -MT $out -MF $DEP_FILE -o $out -c $in description = Building C object $out @@ -33,7 +33,7 @@ rule C_COMPILER__djivideojni # Rule for linking C shared library. rule C_SHARED_LIBRARY_LINKER__djivideojni - command = $PRE_LINK && /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=i686-none-linux-android22 --gcc-toolchain=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64 --sysroot=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot -fPIC $LANGUAGE_COMPILE_FLAGS $ARCH_FLAGS $LINK_FLAGS -shared $SONAME_FLAG$SONAME -o $TARGET_FILE $in $LINK_PATH $LINK_LIBRARIES && $POST_BUILD + command = $PRE_LINK && /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang --target=i686-none-linux-android22 --gcc-toolchain=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64 --sysroot=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -fPIC $LANGUAGE_COMPILE_FLAGS $ARCH_FLAGS $LINK_FLAGS -shared $SONAME_FLAG$SONAME -o $TARGET_FILE $in $LINK_PATH $LINK_LIBRARIES && $POST_BUILD description = Linking C shared library $TARGET_FILE restat = $RESTAT @@ -42,7 +42,7 @@ rule C_SHARED_LIBRARY_LINKER__djivideojni # Rule for re-running cmake. rule RERUN_CMAKE - command = /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -H/home/smartdrone/Working_Private/rosettadrone_work/app -B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/debug/x86 + command = /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake -H/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app -B/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/debug/x86 description = Re-running CMake... generator = 1 @@ -51,7 +51,7 @@ rule RERUN_CMAKE # Rule for cleaning all built files. rule CLEAN - command = /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja -t clean + command = /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -t clean description = Cleaning all built files... @@ -59,6 +59,6 @@ rule CLEAN # Rule for printing all primary targets available. rule HELP - command = /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja -t targets + command = /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -t targets description = All primary targets available: diff --git a/app/.cxx/cmake/release/arm64-v8a/CMakeCache.txt b/app/.cxx/cmake/release/arm64-v8a/CMakeCache.txt index 9baf11c..38b3782 100644 --- a/app/.cxx/cmake/release/arm64-v8a/CMakeCache.txt +++ b/app/.cxx/cmake/release/arm64-v8a/CMakeCache.txt @@ -1,6 +1,6 @@ # This is the CMakeCache file. -# For build in directory: /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a -# It was generated by CMake: /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake +# For build in directory: /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a +# It was generated by CMake: /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. # If you do want to change a value, simply edit, save, and exit the editor. @@ -18,13 +18,19 @@ ANDROID_ABI:UNINITIALIZED=arm64-v8a //No help, variable specified on the command line. -ANDROID_NDK:UNINITIALIZED=/home/smartdrone/Android/Sdk/ndk/21.3.6528147 +ANDROID_NDK:UNINITIALIZED=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 //No help, variable specified on the command line. ANDROID_PLATFORM:UNINITIALIZED=android-22 +//No help, variable specified on the command line. +CMAKE_ANDROID_ARCH_ABI:UNINITIALIZED=arm64-v8a + +//No help, variable specified on the command line. +CMAKE_ANDROID_NDK:UNINITIALIZED=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 + //Archiver -CMAKE_AR:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar +CMAKE_AR:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android-ar //Flags used by the compiler during all build types. CMAKE_ASM_FLAGS:STRING= @@ -39,6 +45,12 @@ CMAKE_ASM_FLAGS_RELEASE:STRING= // CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel. CMAKE_BUILD_TYPE:STRING=Release +//LLVM archiver +CMAKE_CXX_COMPILER_AR:FILEPATH=CMAKE_CXX_COMPILER_AR-NOTFOUND + +//Generate index for LLVM archive +CMAKE_CXX_COMPILER_RANLIB:FILEPATH=CMAKE_CXX_COMPILER_RANLIB-NOTFOUND + //Flags used by the compiler during all build types. CMAKE_CXX_FLAGS:STRING= @@ -58,6 +70,12 @@ CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG //Libraries linked by default with all C++ applications. CMAKE_CXX_STANDARD_LIBRARIES:STRING=-latomic -lm +//LLVM archiver +CMAKE_C_COMPILER_AR:FILEPATH=CMAKE_C_COMPILER_AR-NOTFOUND + +//Generate index for LLVM archive +CMAKE_C_COMPILER_RANLIB:FILEPATH=CMAKE_C_COMPILER_RANLIB-NOTFOUND + //Flags used by the compiler during all build types. CMAKE_C_FLAGS:STRING= @@ -93,19 +111,22 @@ CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING= CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Enable/Disable output of compile commands during generation. -CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF +CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON + +//No help, variable specified on the command line. +CMAKE_FIND_ROOT_PATH:UNINITIALIZED=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/prefab/arm64-v8a/prefab //Install path prefix, prepended onto install directories. CMAKE_INSTALL_PREFIX:PATH=/usr/local //No help, variable specified on the command line. -CMAKE_LIBRARY_OUTPUT_DIRECTORY:UNINITIALIZED=/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj/arm64-v8a +CMAKE_LIBRARY_OUTPUT_DIRECTORY:UNINITIALIZED=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/release/obj/arm64-v8a //Path to a program. -CMAKE_LINKER:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ld +CMAKE_LINKER:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android-ld //No help, variable specified on the command line. -CMAKE_MAKE_PROGRAM:UNINITIALIZED=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja +CMAKE_MAKE_PROGRAM:UNINITIALIZED=/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja //Flags used by the linker during the creation of modules. CMAKE_MODULE_LINKER_FLAGS:STRING= @@ -123,19 +144,19 @@ CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Path to a program. -CMAKE_NM:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-nm +CMAKE_NM:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android-nm //Path to a program. -CMAKE_OBJCOPY:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-objcopy +CMAKE_OBJCOPY:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android-objcopy //Path to a program. -CMAKE_OBJDUMP:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-objdump +CMAKE_OBJDUMP:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android-objdump //Value Computed by CMake CMAKE_PROJECT_NAME:STATIC=Project //Ranlib -CMAKE_RANLIB:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ranlib +CMAKE_RANLIB:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android-ranlib //Flags used by the linker during the creation of dll's. CMAKE_SHARED_LINKER_FLAGS:STRING= @@ -175,10 +196,16 @@ CMAKE_STATIC_LINKER_FLAGS_RELEASE:STRING= CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Path to a program. -CMAKE_STRIP:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-strip +CMAKE_STRIP:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/aarch64-linux-android-strip + +//No help, variable specified on the command line. +CMAKE_SYSTEM_NAME:UNINITIALIZED=Android + +//No help, variable specified on the command line. +CMAKE_SYSTEM_VERSION:UNINITIALIZED=22 //The CMake toolchain file -CMAKE_TOOLCHAIN_FILE:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake +CMAKE_TOOLCHAIN_FILE:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake //If this value is on, makefiles will be generated without the // .SILENT directive, and all commands will be echoed to the console @@ -187,16 +214,16 @@ CMAKE_TOOLCHAIN_FILE:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/buil CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE //Value Computed by CMake -Project_BINARY_DIR:STATIC=/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a +Project_BINARY_DIR:STATIC=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a //Value Computed by CMake -Project_SOURCE_DIR:STATIC=/home/smartdrone/Working_Private/rosettadrone_work/app +Project_SOURCE_DIR:STATIC=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app //Dependencies for the target -djivideojni_LIB_DEPENDS:STATIC=general;ffmpegjni;general;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/22/liblog.so; +djivideojni_LIB_DEPENDS:STATIC=general;ffmpegjni;general;/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/22/liblog.so; //Path to a library. -log-lib:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/22/liblog.so +log-lib:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/22/liblog.so ######################## @@ -206,19 +233,23 @@ log-lib:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/p //ADVANCED property for variable: CMAKE_AR CMAKE_AR-ADVANCED:INTERNAL=1 //This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a +CMAKE_CACHEFILE_DIR:INTERNAL=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3 //Minor version of cmake used to create the current loaded cache -CMAKE_CACHE_MINOR_VERSION:INTERNAL=6 +CMAKE_CACHE_MINOR_VERSION:INTERNAL=10 //Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=0 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=2 //Path to CMake executable. -CMAKE_COMMAND:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake +CMAKE_COMMAND:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake //Path to cpack program executable. -CMAKE_CPACK_COMMAND:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cpack +CMAKE_CPACK_COMMAND:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cpack //Path to ctest program executable. -CMAKE_CTEST_COMMAND:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ctest +CMAKE_CTEST_COMMAND:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/ctest +//ADVANCED property for variable: CMAKE_CXX_COMPILER_AR +CMAKE_CXX_COMPILER_AR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_CXX_COMPILER_RANLIB +CMAKE_CXX_COMPILER_RANLIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG @@ -231,6 +262,10 @@ CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1 CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_STANDARD_LIBRARIES CMAKE_CXX_STANDARD_LIBRARIES-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_COMPILER_AR +CMAKE_C_COMPILER_AR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_COMPILER_RANLIB +CMAKE_C_COMPILER_RANLIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_C_FLAGS CMAKE_C_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG @@ -256,7 +291,7 @@ CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1 //Name of external makefile project generator. -CMAKE_EXTRA_GENERATOR:INTERNAL=Android Gradle +CMAKE_EXTRA_GENERATOR:INTERNAL= //Name of generator. CMAKE_GENERATOR:INTERNAL=Ninja //Name of generator platform. @@ -265,9 +300,9 @@ CMAKE_GENERATOR_PLATFORM:INTERNAL= CMAKE_GENERATOR_TOOLSET:INTERNAL= //Source directory with the top level CMakeLists.txt file for this // project -CMAKE_HOME_DIRECTORY:INTERNAL=/home/smartdrone/Working_Private/rosettadrone_work/app +CMAKE_HOME_DIRECTORY:INTERNAL=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app //Install .so files without execute permission. -CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1 +CMAKE_INSTALL_SO_NO_EXE:INTERNAL=0 //ADVANCED property for variable: CMAKE_LINKER CMAKE_LINKER-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS @@ -288,10 +323,12 @@ CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1 CMAKE_OBJCOPY-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_OBJDUMP CMAKE_OBJDUMP-ADVANCED:INTERNAL=1 +//Platform information initialized +CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1 //ADVANCED property for variable: CMAKE_RANLIB CMAKE_RANLIB-ADVANCED:INTERNAL=1 //Path to CMake installation. -CMAKE_ROOT:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6 +CMAKE_ROOT:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG @@ -319,7 +356,7 @@ CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_STRIP CMAKE_STRIP-ADVANCED:INTERNAL=1 //uname command -CMAKE_UNAME:INTERNAL=/bin/uname +CMAKE_UNAME:INTERNAL=/usr/bin/uname //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 diff --git a/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake b/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake deleted file mode 100644 index b994e59..0000000 --- a/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake +++ /dev/null @@ -1,67 +0,0 @@ -set(CMAKE_C_COMPILER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang") -set(CMAKE_C_COMPILER_ARG1 "") -set(CMAKE_C_COMPILER_ID "Clang") -set(CMAKE_C_COMPILER_VERSION "9.0") -set(CMAKE_C_COMPILER_WRAPPER "") -set(CMAKE_C_STANDARD_COMPUTED_DEFAULT "11") -set(CMAKE_C_COMPILE_FEATURES "c_function_prototypes;c_restrict;c_variadic_macros;c_static_assert") -set(CMAKE_C90_COMPILE_FEATURES "c_function_prototypes") -set(CMAKE_C99_COMPILE_FEATURES "c_restrict;c_variadic_macros") -set(CMAKE_C11_COMPILE_FEATURES "c_static_assert") - -set(CMAKE_C_PLATFORM_ID "") -set(CMAKE_C_SIMULATE_ID "") -set(CMAKE_C_SIMULATE_VERSION "") - -set(CMAKE_AR "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar") -set(CMAKE_RANLIB "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ranlib") -set(CMAKE_LINKER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ld") -set(CMAKE_COMPILER_IS_GNUCC ) -set(CMAKE_C_COMPILER_LOADED 1) -set(CMAKE_C_COMPILER_WORKS TRUE) -set(CMAKE_C_ABI_COMPILED TRUE) -set(CMAKE_COMPILER_IS_MINGW ) -set(CMAKE_COMPILER_IS_CYGWIN ) -if(CMAKE_COMPILER_IS_CYGWIN) - set(CYGWIN 1) - set(UNIX 1) -endif() - -set(CMAKE_C_COMPILER_ENV_VAR "CC") - -if(CMAKE_COMPILER_IS_MINGW) - set(MINGW 1) -endif() -set(CMAKE_C_COMPILER_ID_RUN 1) -set(CMAKE_C_SOURCE_FILE_EXTENSIONS c;m) -set(CMAKE_C_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC) -set(CMAKE_C_LINKER_PREFERENCE 10) - -# Save compiler ABI information. -set(CMAKE_C_SIZEOF_DATA_PTR "8") -set(CMAKE_C_COMPILER_ABI "ELF") -set(CMAKE_C_LIBRARY_ARCHITECTURE "") - -if(CMAKE_C_SIZEOF_DATA_PTR) - set(CMAKE_SIZEOF_VOID_P "${CMAKE_C_SIZEOF_DATA_PTR}") -endif() - -if(CMAKE_C_COMPILER_ABI) - set(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_C_COMPILER_ABI}") -endif() - -if(CMAKE_C_LIBRARY_ARCHITECTURE) - set(CMAKE_LIBRARY_ARCHITECTURE "") -endif() - -set(CMAKE_C_CL_SHOWINCLUDES_PREFIX "") -if(CMAKE_C_CL_SHOWINCLUDES_PREFIX) - set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_C_CL_SHOWINCLUDES_PREFIX}") -endif() - - - - -set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "dl;c;dl") -set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/9.0.8/lib/linux/aarch64;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib/gcc/aarch64-linux-android/4.9.x;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/aarch64-linux-android/lib64;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/22;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/aarch64-linux-android/lib;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib") -set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "") diff --git a/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake b/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake deleted file mode 100644 index a574557..0000000 --- a/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake +++ /dev/null @@ -1,68 +0,0 @@ -set(CMAKE_CXX_COMPILER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++") -set(CMAKE_CXX_COMPILER_ARG1 "") -set(CMAKE_CXX_COMPILER_ID "Clang") -set(CMAKE_CXX_COMPILER_VERSION "9.0") -set(CMAKE_CXX_COMPILER_WRAPPER "") -set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT "14") -set(CMAKE_CXX_COMPILE_FEATURES "cxx_template_template_parameters;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates") -set(CMAKE_CXX98_COMPILE_FEATURES "cxx_template_template_parameters") -set(CMAKE_CXX11_COMPILE_FEATURES "cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates") -set(CMAKE_CXX14_COMPILE_FEATURES "cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates") - -set(CMAKE_CXX_PLATFORM_ID "") -set(CMAKE_CXX_SIMULATE_ID "") -set(CMAKE_CXX_SIMULATE_VERSION "") - -set(CMAKE_AR "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar") -set(CMAKE_RANLIB "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ranlib") -set(CMAKE_LINKER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ld") -set(CMAKE_COMPILER_IS_GNUCXX ) -set(CMAKE_CXX_COMPILER_LOADED 1) -set(CMAKE_CXX_COMPILER_WORKS TRUE) -set(CMAKE_CXX_ABI_COMPILED TRUE) -set(CMAKE_COMPILER_IS_MINGW ) -set(CMAKE_COMPILER_IS_CYGWIN ) -if(CMAKE_COMPILER_IS_CYGWIN) - set(CYGWIN 1) - set(UNIX 1) -endif() - -set(CMAKE_CXX_COMPILER_ENV_VAR "CXX") - -if(CMAKE_COMPILER_IS_MINGW) - set(MINGW 1) -endif() -set(CMAKE_CXX_COMPILER_ID_RUN 1) -set(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC) -set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;mm;CPP) -set(CMAKE_CXX_LINKER_PREFERENCE 30) -set(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1) - -# Save compiler ABI information. -set(CMAKE_CXX_SIZEOF_DATA_PTR "8") -set(CMAKE_CXX_COMPILER_ABI "ELF") -set(CMAKE_CXX_LIBRARY_ARCHITECTURE "") - -if(CMAKE_CXX_SIZEOF_DATA_PTR) - set(CMAKE_SIZEOF_VOID_P "${CMAKE_CXX_SIZEOF_DATA_PTR}") -endif() - -if(CMAKE_CXX_COMPILER_ABI) - set(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_CXX_COMPILER_ABI}") -endif() - -if(CMAKE_CXX_LIBRARY_ARCHITECTURE) - set(CMAKE_LIBRARY_ARCHITECTURE "") -endif() - -set(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX "") -if(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX) - set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_CXX_CL_SHOWINCLUDES_PREFIX}") -endif() - - - - -set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "c++;m;dl;c;dl") -set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/9.0.8/lib/linux/aarch64;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib/gcc/aarch64-linux-android/4.9.x;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/aarch64-linux-android/lib64;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/22;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/aarch64-linux-android/lib;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib") -set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "") diff --git a/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin b/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin deleted file mode 100755 index 1c49320..0000000 Binary files a/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin and /dev/null differ diff --git a/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin b/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin deleted file mode 100755 index f18a43d..0000000 Binary files a/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin and /dev/null differ diff --git a/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeSystem.cmake b/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeSystem.cmake deleted file mode 100644 index 835339c..0000000 --- a/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/3.6.0-rc2/CMakeSystem.cmake +++ /dev/null @@ -1,15 +0,0 @@ -set(CMAKE_HOST_SYSTEM "Linux-4.15.0-112-generic") -set(CMAKE_HOST_SYSTEM_NAME "Linux") -set(CMAKE_HOST_SYSTEM_VERSION "4.15.0-112-generic") -set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64") - -include("/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake") - -set(CMAKE_SYSTEM "Android-1") -set(CMAKE_SYSTEM_NAME "Android") -set(CMAKE_SYSTEM_VERSION "1") -set(CMAKE_SYSTEM_PROCESSOR "aarch64") - -set(CMAKE_CROSSCOMPILING "TRUE") - -set(CMAKE_SYSTEM_LOADED 1) diff --git a/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/TargetDirectories.txt b/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/TargetDirectories.txt index b1adc9f..90f2876 100644 --- a/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/TargetDirectories.txt +++ b/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/TargetDirectories.txt @@ -1,3 +1,3 @@ -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/rebuild_cache.dir -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/edit_cache.dir -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/djivideojni.dir +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/rebuild_cache.dir +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/edit_cache.dir +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/djivideojni.dir diff --git a/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/feature_tests.bin b/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/feature_tests.bin index 5bc1dbd..da00688 100755 Binary files a/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/feature_tests.bin and b/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/feature_tests.bin differ diff --git a/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/feature_tests.cxx b/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/feature_tests.cxx index a9b4791..703b335 100644 --- a/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/feature_tests.cxx +++ b/app/.cxx/cmake/release/arm64-v8a/CMakeFiles/feature_tests.cxx @@ -1,35 +1,35 @@ const char features[] = {"\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_aggregate_nsdmi) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_aggregate_nsdmi) "1" #else "0" #endif "cxx_aggregate_default_initializers\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_alias_templates) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_alias_templates) "1" #else "0" #endif "cxx_alias_templates\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_alignas) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_alignas) "1" #else "0" #endif "cxx_alignas\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_alignas) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_alignas) "1" #else "0" #endif "cxx_alignof\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_attributes) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_attributes) "1" #else "0" @@ -43,35 +43,35 @@ #endif "cxx_attribute_deprecated\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_auto_type) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_auto_type) "1" #else "0" #endif "cxx_auto_type\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_binary_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_binary_literals) "1" #else "0" #endif "cxx_binary_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_constexpr) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_constexpr) "1" #else "0" #endif "cxx_constexpr\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_contextual_conversions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_contextual_conversions) "1" #else "0" #endif "cxx_contextual_conversions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_decltype) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_decltype) "1" #else "0" @@ -85,42 +85,42 @@ #endif "cxx_decltype_auto\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_decltype_incomplete_return_types) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_decltype_incomplete_return_types) "1" #else "0" #endif "cxx_decltype_incomplete_return_types\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_default_function_template_args) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_default_function_template_args) "1" #else "0" #endif "cxx_default_function_template_args\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_defaulted_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_defaulted_functions) "1" #else "0" #endif "cxx_defaulted_functions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_defaulted_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_defaulted_functions) "1" #else "0" #endif "cxx_defaulted_move_initializers\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_delegating_constructors) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_delegating_constructors) "1" #else "0" #endif "cxx_delegating_constructors\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_deleted_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_deleted_functions) "1" #else "0" @@ -134,49 +134,49 @@ #endif "cxx_digit_separators\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_enum_forward_declarations\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_explicit_conversions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_explicit_conversions) "1" #else "0" #endif "cxx_explicit_conversions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_extended_friend_declarations\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_extern_templates\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_override_control) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_override_control) "1" #else "0" #endif "cxx_final\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_func_identifier\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_generalized_initializers) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_generalized_initializers) "1" #else "0" @@ -190,210 +190,210 @@ #endif "cxx_generic_lambdas\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_inheriting_constructors) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_inheriting_constructors) "1" #else "0" #endif "cxx_inheriting_constructors\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_inline_namespaces\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_lambdas) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_lambdas) "1" #else "0" #endif "cxx_lambdas\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_init_captures) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_init_captures) "1" #else "0" #endif "cxx_lambda_init_captures\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_local_type_template_args) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_local_type_template_args) "1" #else "0" #endif "cxx_local_type_template_args\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_long_long_type\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_noexcept) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_noexcept) "1" #else "0" #endif "cxx_noexcept\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_nonstatic_member_init) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_nonstatic_member_init) "1" #else "0" #endif "cxx_nonstatic_member_init\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_nullptr) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_nullptr) "1" #else "0" #endif "cxx_nullptr\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_override_control) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_override_control) "1" #else "0" #endif "cxx_override\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_range_for) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_range_for) "1" #else "0" #endif "cxx_range_for\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_raw_string_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_raw_string_literals) "1" #else "0" #endif "cxx_raw_string_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_reference_qualified_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_reference_qualified_functions) "1" #else "0" #endif "cxx_reference_qualified_functions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_relaxed_constexpr) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_relaxed_constexpr) "1" #else "0" #endif "cxx_relaxed_constexpr\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_return_type_deduction) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_return_type_deduction) "1" #else "0" #endif "cxx_return_type_deduction\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_right_angle_brackets\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_rvalue_references) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_rvalue_references) "1" #else "0" #endif "cxx_rvalue_references\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_sizeof_member\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_static_assert) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_static_assert) "1" #else "0" #endif "cxx_static_assert\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_strong_enums) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_strong_enums) "1" #else "0" #endif "cxx_strong_enums\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 199711L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 199711L "1" #else "0" #endif "cxx_template_template_parameters\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_thread_local) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_thread_local) "1" #else "0" #endif "cxx_thread_local\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_trailing_return) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_trailing_return) "1" #else "0" #endif "cxx_trailing_return_types\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_unicode_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_unicode_literals) "1" #else "0" #endif "cxx_unicode_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_generalized_initializers) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_generalized_initializers) "1" #else "0" #endif "cxx_uniform_initialization\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_unrestricted_unions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_unrestricted_unions) "1" #else "0" #endif "cxx_unrestricted_unions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_user_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_user_literals) "1" #else "0" #endif "cxx_user_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_variable_templates) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_variable_templates) "1" #else "0" #endif "cxx_variable_templates\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_variadic_macros\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_variadic_templates) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_variadic_templates) "1" #else "0" diff --git a/app/.cxx/cmake/release/arm64-v8a/android_gradle_build.json b/app/.cxx/cmake/release/arm64-v8a/android_gradle_build.json index 80c6624..ef2ea98 100644 --- a/app/.cxx/cmake/release/arm64-v8a/android_gradle_build.json +++ b/app/.cxx/cmake/release/arm64-v8a/android_gradle_build.json @@ -1,65 +1,45 @@ - { - "buildFiles" : - [ - "/home/smartdrone/Working_Private/rosettadrone_work/app/CMakeLists.txt" - ], - "cFileExtensions" : [ "c" ], - "cleanCommands" : - [ - "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a --target clean" - ], - "libraries" : - { - "c++_shared-Release-arm64-v8a" : - { - "abi" : "arm64-v8a", - "artifactName" : "c++_shared", - "buildType" : "release", - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/arm64-v8a/libc++_shared.so.27", - "toolchain" : "6038786665986016389" - }, - "djivideojni-Release-arm64-v8a" : - { - "abi" : "arm64-v8a", - "artifactName" : "djivideojni", - "buildCommand" : "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a --target djivideojni", - "buildType" : "release", - "files" : - [ - - { - "flags" : " --target=aarch64-none-linux-android22 --gcc-toolchain=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64 --sysroot=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot -Ddjivideojni_EXPORTS -I../../../../src/main/cpp -I../../../../src/main/cpp/include -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/gstreamer-1.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/glib-2.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/lib/glib-2.0/include -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O2 -DNDEBUG -fPIC -c ", - "src" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/dji_video_jni.c", - "workingDirectory" : "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a" - } - ], - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj/arm64-v8a/libdjivideojni.so", - "toolchain" : "6038786665986016389" - }, - "ffmpegjni-Release-arm64-v8a" : - { - "abi" : "arm64-v8a", - "artifactName" : "ffmpegjni", - "buildType" : "release", - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/arm64-v8a/libffmpeg.so", - "toolchain" : "6038786665986016389" - }, - "gstreamer_android-Release-arm64-v8a" : - { - "abi" : "arm64-v8a", - "artifactName" : "gstreamer_android", - "buildType" : "release", - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/arm64-v8a/libgstreamer_android.so", - "toolchain" : "6038786665986016389" - } - }, - "toolchains" : - { - "6038786665986016389" : - { - "cCompilerExecutable" : "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang", - "cppCompilerExecutable" : "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++" - } - } -} + "stringTable": { + "0": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a", + "1": "--target=aarch64-none-linux-android22 --gcc-toolchain=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64 --sysroot=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -Ddjivideojni_EXPORTS -I../../../../src/main/cpp -I../../../../src/main/cpp/include -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/gstreamer-1.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/glib-2.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/lib/glib-2.0/include -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -fno-addrsig -Wa,--noexecstack -Wformat -Werror=format-security -O2 -DNDEBUG -fPIC" + }, + "buildFiles": [ + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake" + ], + "cleanCommands": [ + "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a\" clean" + ], + "buildTargetsCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a\" {LIST_OF_TARGETS_TO_BUILD}", + "libraries": { + "djivideojni-Release-arm64-v8a": { + "buildCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a\" djivideojni", + "buildType": "release", + "toolchain": "3669181217", + "abi": "arm64-v8a", + "artifactName": "djivideojni", + "files": [ + { + "src": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/src/main/cpp/dji_video_jni.c", + "flagsOrdinal": 1, + "workingDirectoryOrdinal": 0 + } + ], + "headers": [], + "output": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/release/obj/arm64-v8a/libdjivideojni.so", + "runtimeFiles": [ + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/src/main/cpp/lib/arm64-v8a/libffmpeg.so" + ] + } + }, + "toolchains": { + "3669181217": { + "cCompilerExecutable": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang" + } + }, + "cFileExtensions": [ + "c" + ], + "cppFileExtensions": [] +} \ No newline at end of file diff --git a/app/.cxx/cmake/release/arm64-v8a/android_gradle_build_mini.json b/app/.cxx/cmake/release/arm64-v8a/android_gradle_build_mini.json index b600c65..799c375 100644 --- a/app/.cxx/cmake/release/arm64-v8a/android_gradle_build_mini.json +++ b/app/.cxx/cmake/release/arm64-v8a/android_gradle_build_mini.json @@ -1,31 +1,22 @@ { "buildFiles": [ - "/home/smartdrone/Working_Private/rosettadrone_work/app/CMakeLists.txt" + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake" ], "cleanCommands": [ - "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a --target clean" + "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a\" clean" ], + "buildTargetsCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a\" {LIST_OF_TARGETS_TO_BUILD}", "libraries": { - "ffmpegjni-Release-arm64-v8a": { - "artifactName": "ffmpegjni", - "abi": "arm64-v8a", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/arm64-v8a/libffmpeg.so" - }, "djivideojni-Release-arm64-v8a": { "artifactName": "djivideojni", - "buildCommand": "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a --target djivideojni", + "buildCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a\" djivideojni", "abi": "arm64-v8a", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj/arm64-v8a/libdjivideojni.so" - }, - "gstreamer_android-Release-arm64-v8a": { - "artifactName": "gstreamer_android", - "abi": "arm64-v8a", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/arm64-v8a/libgstreamer_android.so" - }, - "c++_shared-Release-arm64-v8a": { - "artifactName": "c++_shared", - "abi": "arm64-v8a", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/arm64-v8a/libc++_shared.so.27" + "output": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/release/obj/arm64-v8a/libdjivideojni.so", + "runtimeFiles": [ + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/src/main/cpp/lib/arm64-v8a/libffmpeg.so" + ] } } } \ No newline at end of file diff --git a/app/.cxx/cmake/release/arm64-v8a/android_gradle_generate_cmake_ninja_json_arm64-v8a.command.txt b/app/.cxx/cmake/release/arm64-v8a/android_gradle_generate_cmake_ninja_json_arm64-v8a.command.txt deleted file mode 100644 index 13b6bf2..0000000 --- a/app/.cxx/cmake/release/arm64-v8a/android_gradle_generate_cmake_ninja_json_arm64-v8a.command.txt +++ /dev/null @@ -1,14 +0,0 @@ -Executable : /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -arguments : --H/home/smartdrone/Working_Private/rosettadrone_work/app --B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a --DANDROID_ABI=arm64-v8a --DANDROID_PLATFORM=android-22 --DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj/arm64-v8a --DCMAKE_BUILD_TYPE=Release --DANDROID_NDK=/home/smartdrone/Android/Sdk/ndk/21.3.6528147 --DCMAKE_TOOLCHAIN_FILE=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake --DCMAKE_MAKE_PROGRAM=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja --GAndroid Gradle - Ninja -jvmArgs : - diff --git a/app/.cxx/cmake/release/arm64-v8a/android_gradle_generate_cmake_ninja_json_arm64-v8a.stderr.txt b/app/.cxx/cmake/release/arm64-v8a/android_gradle_generate_cmake_ninja_json_arm64-v8a.stderr.txt deleted file mode 100644 index e69de29..0000000 diff --git a/app/.cxx/cmake/release/arm64-v8a/android_gradle_generate_cmake_ninja_json_arm64-v8a.stdout.txt b/app/.cxx/cmake/release/arm64-v8a/android_gradle_generate_cmake_ninja_json_arm64-v8a.stdout.txt deleted file mode 100644 index 557623f..0000000 --- a/app/.cxx/cmake/release/arm64-v8a/android_gradle_generate_cmake_ninja_json_arm64-v8a.stdout.txt +++ /dev/null @@ -1,15 +0,0 @@ --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -- works --- Detecting C compiler ABI info --- Detecting C compiler ABI info - done --- Detecting C compile features --- Detecting C compile features - done --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -- works --- Detecting CXX compiler ABI info --- Detecting CXX compiler ABI info - done --- Detecting CXX compile features --- Detecting CXX compile features - done --- Configuring done --- Generating done --- Build files have been written to: /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a diff --git a/app/.cxx/cmake/release/arm64-v8a/build.ninja b/app/.cxx/cmake/release/arm64-v8a/build.ninja index 502fc8b..5b4b53e 100644 --- a/app/.cxx/cmake/release/arm64-v8a/build.ninja +++ b/app/.cxx/cmake/release/arm64-v8a/build.ninja @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Ninja" Generator, CMake Version 3.6 +# Generated by "Ninja" Generator, CMake Version 3.10 # This file contains all the build statements describing the # compilation DAG. @@ -34,7 +34,7 @@ include rules.ninja # Utility command for rebuild_cache build CMakeFiles/rebuild_cache.util: CUSTOM_COMMAND - COMMAND = cd /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a && /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -H/home/smartdrone/Working_Private/rosettadrone_work/app -B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a + COMMAND = cd /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a && /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake -H/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app -B/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a DESC = Running CMake to regenerate build system... pool = console restat = 1 @@ -44,19 +44,23 @@ build rebuild_cache: phony CMakeFiles/rebuild_cache.util # Utility command for edit_cache build CMakeFiles/edit_cache.util: CUSTOM_COMMAND - COMMAND = cd /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a && /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. + COMMAND = cd /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a && /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. DESC = No interactive CMake dialog available... restat = 1 build edit_cache: phony CMakeFiles/edit_cache.util # ============================================================================= # Object build statements for SHARED_LIBRARY target djivideojni -build CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o: C_COMPILER__djivideojni ../../../../src/main/cpp/dji_video_jni.c + +############################################# +# Order-only phony target for djivideojni + +build cmake_object_order_depends_target_djivideojni: phony +build CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o: C_COMPILER__djivideojni ../../../../src/main/cpp/dji_video_jni.c || cmake_object_order_depends_target_djivideojni DEFINES = -Ddjivideojni_EXPORTS DEP_FILE = CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o.d - FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O2 -DNDEBUG -fPIC + FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -fno-addrsig -Wa,--noexecstack -Wformat -Werror=format-security -O2 -DNDEBUG -fPIC INCLUDES = -I../../../../src/main/cpp -I../../../../src/main/cpp/include -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/gstreamer-1.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/glib-2.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/lib/glib-2.0/include - IN_ABS = /home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/dji_video_jni.c OBJECT_DIR = CMakeFiles/djivideojni.dir OBJECT_FILE_DIR = CMakeFiles/djivideojni.dir/src/main/cpp @@ -67,10 +71,10 @@ build CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o: C_COMPILER__dji ############################################# # Link the shared library ../../../../build/intermediates/cmake/release/obj/arm64-v8a/libdjivideojni.so -build ../../../../build/intermediates/cmake/release/obj/arm64-v8a/libdjivideojni.so: C_SHARED_LIBRARY_LINKER__djivideojni CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o | ../../../../src/main/cpp/lib/arm64-v8a/libffmpeg.so /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/22/liblog.so - LANGUAGE_COMPILE_FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O2 -DNDEBUG - LINK_FLAGS = -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libgcc_real.a -Wl,--exclude-libs,libatomic.a -static-libstdc++ -Wl,--build-id -Wl,--fatal-warnings -Wl,--no-undefined -Qunused-arguments - LINK_LIBRARIES = ../../../../src/main/cpp/lib/arm64-v8a/libffmpeg.so /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/22/liblog.so -latomic -lm +build ../../../../build/intermediates/cmake/release/obj/arm64-v8a/libdjivideojni.so: C_SHARED_LIBRARY_LINKER__djivideojni CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o | ../../../../src/main/cpp/lib/arm64-v8a/libffmpeg.so /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/22/liblog.so + LANGUAGE_COMPILE_FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -fno-addrsig -Wa,--noexecstack -Wformat -Werror=format-security -O2 -DNDEBUG + LINK_FLAGS = -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -static-libstdc++ -Wl,--build-id -Wl,--warn-shared-textrel -Wl,--fatal-warnings -Wl,--no-undefined -Qunused-arguments -Wl,-z,noexecstack + LINK_LIBRARIES = ../../../../src/main/cpp/lib/arm64-v8a/libffmpeg.so -llog -latomic -lm OBJECT_DIR = CMakeFiles/djivideojni.dir POST_BUILD = : PRE_LINK = : @@ -104,13 +108,13 @@ default all ############################################# # Re-run CMake if any of its inputs changed. -build build.ninja: RERUN_CMAKE | ../../../../CMakeLists.txt /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompilerABI.c /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompilerABI.cpp /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCommonLanguageInclude.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompileFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompilerABI.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeFindBinUtils.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeGenericSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeLanguageInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeParseImplicitLinkInfo.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystem.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInitialize.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCompilerCommon.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/GNU.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Internal/FeatureTesting.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Android.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Linux.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/UnixPaths.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/platforms.cmake CMakeCache.txt CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx +build build.ninja: RERUN_CMAKE | ../../../../CMakeLists.txt /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompilerABI.c /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompilerABI.cpp /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCommonLanguageInclude.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompileFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompilerABI.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeFindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeGenericSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeLanguageInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeParseImplicitLinkInfo.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystem.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInitialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCompilerCommon.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/CMakeCommonCompilerMacros.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-FindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/GNU.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Internal/FeatureTesting.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Initialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android/Determine-Compiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Linux.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/UnixPaths.cmake CMakeCache.txt CMakeFiles/3.10.2/CMakeCCompiler.cmake CMakeFiles/3.10.2/CMakeCXXCompiler.cmake CMakeFiles/3.10.2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx pool = console ############################################# # A missing CMake input file is not an error. -build ../../../../CMakeLists.txt /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompilerABI.c /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompilerABI.cpp /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCommonLanguageInclude.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompileFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompilerABI.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeFindBinUtils.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeGenericSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeLanguageInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeParseImplicitLinkInfo.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystem.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInitialize.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCompilerCommon.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/GNU.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Internal/FeatureTesting.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Android.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Linux.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/UnixPaths.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/platforms.cmake CMakeCache.txt CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx: phony +build ../../../../CMakeLists.txt /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompilerABI.c /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompilerABI.cpp /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCommonLanguageInclude.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompileFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompilerABI.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeFindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeGenericSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeLanguageInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeParseImplicitLinkInfo.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystem.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInitialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCompilerCommon.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/CMakeCommonCompilerMacros.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-FindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/GNU.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Internal/FeatureTesting.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Initialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android/Determine-Compiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Linux.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/UnixPaths.cmake CMakeCache.txt CMakeFiles/3.10.2/CMakeCCompiler.cmake CMakeFiles/3.10.2/CMakeCXXCompiler.cmake CMakeFiles/3.10.2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx: phony ############################################# # Clean all the built files. diff --git a/app/.cxx/cmake/release/arm64-v8a/build_command.txt b/app/.cxx/cmake/release/arm64-v8a/build_command.txt index 13b6bf2..ad691f3 100644 --- a/app/.cxx/cmake/release/arm64-v8a/build_command.txt +++ b/app/.cxx/cmake/release/arm64-v8a/build_command.txt @@ -1,14 +1,21 @@ -Executable : /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake + Executable : /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake arguments : --H/home/smartdrone/Working_Private/rosettadrone_work/app --B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a --DANDROID_ABI=arm64-v8a --DANDROID_PLATFORM=android-22 --DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj/arm64-v8a +-H/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app +-DCMAKE_FIND_ROOT_PATH=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/prefab/arm64-v8a/prefab -DCMAKE_BUILD_TYPE=Release --DANDROID_NDK=/home/smartdrone/Android/Sdk/ndk/21.3.6528147 --DCMAKE_TOOLCHAIN_FILE=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake --DCMAKE_MAKE_PROGRAM=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja --GAndroid Gradle - Ninja +-DCMAKE_TOOLCHAIN_FILE=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake +-DANDROID_ABI=arm64-v8a +-DANDROID_NDK=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 +-DANDROID_PLATFORM=android-22 +-DCMAKE_ANDROID_ARCH_ABI=arm64-v8a +-DCMAKE_ANDROID_NDK=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 +-DCMAKE_EXPORT_COMPILE_COMMANDS=ON +-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/release/obj/arm64-v8a +-DCMAKE_MAKE_PROGRAM=/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja +-DCMAKE_SYSTEM_NAME=Android +-DCMAKE_SYSTEM_VERSION=22 +-B/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a +-GNinja jvmArgs : +Build command args: diff --git a/app/.cxx/cmake/release/arm64-v8a/build_model.json b/app/.cxx/cmake/release/arm64-v8a/build_model.json index 710c1c6..eaeb8bd 100644 --- a/app/.cxx/cmake/release/arm64-v8a/build_model.json +++ b/app/.cxx/cmake/release/arm64-v8a/build_model.json @@ -1,69 +1,203 @@ { - "variant": { - "module": { - "rootBuildGradleFolder": "/home/smartdrone/Working_Private/rosettadrone_work", - "sdkFolder": "/home/smartdrone/Android/Sdk", - "isNativeCompilerSettingsCacheEnabled": false, - "isBuildOnlyTargetAbiEnabled": true, - "splitsAbiFilterSet": [], - "intermediatesFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates", - "gradleModulePathName": ":app", - "moduleRootFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app", - "makeFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/CMakeLists.txt", - "buildSystem": "CMAKE", - "compilerSettingsCacheFolder": "/home/smartdrone/Working_Private/rosettadrone_work/.cxx", - "cxxFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx", - "ndkFolder": "/home/smartdrone/Android/Sdk/ndk/21.3.6528147", - "ndkVersion": "21.3.6528147", - "ndkSupportedAbiList": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" + "abi": "ARM64_V8A", + "abiPlatformVersion": 22, + "buildSettings": { + "environmentVariables": [] + }, + "cmake": { + "cmakeArtifactsBaseFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a", + "cmakeServerLogFile": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a/cmake_server_log.txt", + "cmakeWrappingBaseFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cxx/release/arm64-v8a", + "effectiveConfiguration": { + "name": "traditional-android-studio-cmake-environment", + "description": "Composite reified CMakeSettings configuration", + "generator": "Ninja", + "inheritEnvironments": [ + "ndk" ], + "buildRoot": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a", + "cmakeToolchain": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "cmakeExecutable": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake", + "variables": [ + { + "name": "CMAKE_FIND_ROOT_PATH", + "value": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/prefab/arm64-v8a/prefab" + }, + { + "name": "CMAKE_BUILD_TYPE", + "value": "Release" + }, + { + "name": "CMAKE_TOOLCHAIN_FILE", + "value": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake" + }, + { + "name": "ANDROID_ABI", + "value": "arm64-v8a" + }, + { + "name": "ANDROID_NDK", + "value": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944" + }, + { + "name": "ANDROID_PLATFORM", + "value": "android-22" + }, + { + "name": "CMAKE_ANDROID_ARCH_ABI", + "value": "arm64-v8a" + }, + { + "name": "CMAKE_ANDROID_NDK", + "value": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944" + }, + { + "name": "CMAKE_EXPORT_COMPILE_COMMANDS", + "value": "ON" + }, + { + "name": "CMAKE_LIBRARY_OUTPUT_DIRECTORY", + "value": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/release/obj/arm64-v8a" + }, + { + "name": "CMAKE_MAKE_PROGRAM", + "value": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja" + }, + { + "name": "CMAKE_SYSTEM_NAME", + "value": "Android" + }, + { + "name": "CMAKE_SYSTEM_VERSION", + "value": "22" + } + ] + } + }, + "cxxBuildFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a", + "info": { + "abi": "ARM64_V8A", + "bitness": 64, + "deprecated": false, + "default": true + }, + "originalCxxBuildFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a", + "variant": { + "buildSystemArgumentList": [], + "buildTargetSet": [], + "implicitBuildTargetSet": [], + "cFlagsList": [], + "cmakeSettingsConfiguration": "android-gradle-plugin-predetermined-name", + "cppFlagsList": [], + "isDebuggableEnabled": false, + "module": { + "buildSystem": "CMAKE", + "cmake": { + "cmakeExe": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake", + "minimumCmakeVersion": "3.10.2", + "ninjaExe": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja" + }, + "cmakeToolchainFile": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "cxxFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx", + "gradleModulePathName": ":app", + "intermediatesFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates", + "makeFile": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "moduleBuildFile": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build.gradle", + "moduleRootFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app", "ndkDefaultAbiList": [ "ARMEABI_V7A", "ARM64_V8A", "X86", "X86_64" ], - "cmakeToolchainFile": "." + "ndkFolder": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944", + "ndkMetaAbiList": [ + { + "abi": "ARMEABI_V7A", + "bitness": 32, + "deprecated": false, + "default": true + }, + { + "abi": "ARM64_V8A", + "bitness": 64, + "deprecated": false, + "default": true + }, + { + "abi": "X86", + "bitness": 32, + "deprecated": false, + "default": true + }, + { + "abi": "X86_64", + "bitness": 64, + "deprecated": false, + "default": true + } + ], + "ndkMetaPlatforms": { + "min": 16, + "max": 29, + "aliases": { + "20": 19, + "25": 24, + "J": 16, + "J-MR1": 17, + "J-MR2": 18, + "K": 19, + "L": 21, + "L-MR1": 22, + "M": 23, + "N": 24, + "N-MR1": 24, + "O": 26, + "O-MR1": 27, + "P": 28, + "Q": 29 + } + }, + "ndkSupportedAbiList": [ + "ARMEABI_V7A", + "ARM64_V8A", + "X86", + "X86_64" + ], + "ndkDefaultStl": "LIBCXX_STATIC", + "ndkVersion": "20.1.5948944", + "project": { + "compilerSettingsCacheFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/.cxx", + "cxxFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/.cxx", + "isBuildOnlyTargetAbiEnabled": true, + "isCmakeBuildCohabitationEnabled": false, + "isNativeCompilerSettingsCacheEnabled": false, + "rootBuildGradleFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work", + "sdkFolder": "/Users/teni/Library/Android/sdk", + "isPrefabEnabled": false + }, + "splitsAbiFilterSet": [], + "stlSharedObjectMap": { + "LIBCXX_SHARED": { + "ARMEABI_V7A": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi/libc++_shared.so", + "ARM64_V8A": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so", + "X86": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/i686-linux-android/libc++_shared.so", + "X86_64": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/x86_64-linux-android/libc++_shared.so" + }, + "LIBCXX_STATIC": {}, + "NONE": {}, + "SYSTEM": {} + } }, - "buildSystemArgumentList": [], - "cFlagList": [], - "cppFlagsList": [], + "objFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/release/obj", "variantName": "release", - "soFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/lib", - "objFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj", - "jsonFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release", - "gradleBuildOutputFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release", - "isDebuggableEnabled": false, "validAbiList": [ "ARMEABI_V7A", "ARM64_V8A", "X86" ], - "buildTargetSet": [] + "prefabDirectory": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/prefab", + "prefabPackageDirectoryList": [] }, - "abi": "ARM64_V8A", - "abiPlatformVersion": 22, - "cxxBuildFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a", - "jsonFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a/android_gradle_build.json", - "gradleBuildOutputFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/arm64-v8a", - "objFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj/arm64-v8a", - "buildCommandFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a/build_command.txt", - "buildOutputFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a/build_output.txt", - "modelOutputFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a/build_model.json", - "cmake": { - "cmakeListsWrapperFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/arm64-v8a/CMakeLists.txt", - "toolchainWrapperFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/arm64-v8a/android_gradle_build.toolchain.cmake", - "buildGenerationStateFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/arm64-v8a/build_generation_state.json", - "cacheKeyFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/arm64-v8a/compiler_cache_key.json", - "compilerCacheUseFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/arm64-v8a/compiler_cache_use.json", - "compilerCacheWriteFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/arm64-v8a/compiler_cache_write.json", - "toolchainSettingsFromCacheFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/arm64-v8a/compiler_settings_cache.cmake", - "cmakeWrappingBaseFolder": "." - }, - "jsonGenerationLoggingRecordFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a/json_generation_record.json", - "compileCommandsJsonFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a/compile_commands.json" + "prefabFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/prefab/arm64-v8a" } \ No newline at end of file diff --git a/app/.cxx/cmake/release/arm64-v8a/build_output.txt b/app/.cxx/cmake/release/arm64-v8a/build_output.txt index 9ab4aff..bc40114 100644 --- a/app/.cxx/cmake/release/arm64-v8a/build_output.txt +++ b/app/.cxx/cmake/release/arm64-v8a/build_output.txt @@ -1,15 +1,13 @@ --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -- works --- Detecting C compiler ABI info --- Detecting C compiler ABI info - done --- Detecting C compile features --- Detecting C compile features - done --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -- works --- Detecting CXX compiler ABI info --- Detecting CXX compiler ABI info - done --- Detecting CXX compile features --- Detecting CXX compile features - done --- Configuring done --- Generating done --- Build files have been written to: /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a \ No newline at end of file +Check for working C compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang +Check for working C compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang -- works +Detecting C compiler ABI info +Detecting C compiler ABI info - done +Detecting C compile features +Detecting C compile features - done +Check for working CXX compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ +Check for working CXX compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ -- works +Detecting CXX compiler ABI info +Detecting CXX compiler ABI info - done +Detecting CXX compile features +Detecting CXX compile features - done +Configuring done \ No newline at end of file diff --git a/app/.cxx/cmake/release/arm64-v8a/cmake_install.cmake b/app/.cxx/cmake/release/arm64-v8a/cmake_install.cmake index 47ec3ff..bb9b027 100644 --- a/app/.cxx/cmake/release/arm64-v8a/cmake_install.cmake +++ b/app/.cxx/cmake/release/arm64-v8a/cmake_install.cmake @@ -1,4 +1,4 @@ -# Install script for directory: /home/smartdrone/Working_Private/rosettadrone_work/app +# Install script for directory: /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app # Set the install prefix if(NOT DEFINED CMAKE_INSTALL_PREFIX) @@ -29,7 +29,12 @@ endif() # Install shared libraries without execute permission? if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) - set(CMAKE_INSTALL_SO_NO_EXE "1") + set(CMAKE_INSTALL_SO_NO_EXE "0") +endif() + +# Is this installation the result of a crosscompile? +if(NOT DEFINED CMAKE_CROSSCOMPILING) + set(CMAKE_CROSSCOMPILING "TRUE") endif() if(CMAKE_INSTALL_COMPONENT) @@ -40,5 +45,5 @@ endif() string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT "${CMAKE_INSTALL_MANIFEST_FILES}") -file(WRITE "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a/${CMAKE_INSTALL_MANIFEST}" +file(WRITE "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a/${CMAKE_INSTALL_MANIFEST}" "${CMAKE_INSTALL_MANIFEST_CONTENT}") diff --git a/app/.cxx/cmake/release/arm64-v8a/json_generation_record.json b/app/.cxx/cmake/release/arm64-v8a/json_generation_record.json index 8ad37bd..f1a4428 100644 --- a/app/.cxx/cmake/release/arm64-v8a/json_generation_record.json +++ b/app/.cxx/cmake/release/arm64-v8a/json_generation_record.json @@ -1,14 +1,44 @@ [ { "level": "INFO", - "message": "Start JSON generation. Platform version: 22 min SDK version: arm64-v8a" + "message": "Start JSON generation. Platform version: 22 min SDK version: arm64-v8a", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|arm64-v8a" }, { "level": "INFO", - "message": "JSON \u0027/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a/android_gradle_build.json\u0027 was up-to-date" + "message": "No CMake version was specified in build.gradle. Using default version 3.10.2.", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|arm64-v8a" }, { "level": "INFO", - "message": "JSON generation completed without problems" + "message": "Trying to locate CMake in local SDK repository.", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|arm64-v8a" + }, + { + "level": "INFO", + "message": "- CMake found in SDK at \u0027/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404\u0027 had version \u00273.10.2\u0027", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|arm64-v8a" + }, + { + "level": "INFO", + "message": "CMake \u00273.6.0\u0027 found in SDK did not match requested version \u00273.10.2\u0027.", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|arm64-v8a" + }, + { + "level": "INFO", + "message": "JSON \u0027/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a/android_gradle_build.json\u0027 was up-to-date", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|arm64-v8a" + }, + { + "level": "INFO", + "message": "JSON generation completed without problems", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|arm64-v8a" } ] \ No newline at end of file diff --git a/app/.cxx/cmake/release/arm64-v8a/rules.ninja b/app/.cxx/cmake/release/arm64-v8a/rules.ninja index 6b5cdb0..7202ac2 100644 --- a/app/.cxx/cmake/release/arm64-v8a/rules.ninja +++ b/app/.cxx/cmake/release/arm64-v8a/rules.ninja @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Ninja" Generator, CMake Version 3.6 +# Generated by "Ninja" Generator, CMake Version 3.10 # This file contains all the rules used to get the outputs files # built from the input files. @@ -25,7 +25,7 @@ rule CUSTOM_COMMAND rule C_COMPILER__djivideojni depfile = $DEP_FILE deps = gcc - command = /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=aarch64-none-linux-android22 --gcc-toolchain=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64 --sysroot=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot $DEFINES $INCLUDES $FLAGS -MD -MT $out -MF $DEP_FILE -o $out -c $IN_ABS + command = /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang --target=aarch64-none-linux-android22 --gcc-toolchain=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64 --sysroot=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot $DEFINES $INCLUDES $FLAGS -MD -MT $out -MF $DEP_FILE -o $out -c $in description = Building C object $out @@ -33,7 +33,7 @@ rule C_COMPILER__djivideojni # Rule for linking C shared library. rule C_SHARED_LIBRARY_LINKER__djivideojni - command = $PRE_LINK && /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=aarch64-none-linux-android22 --gcc-toolchain=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64 --sysroot=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot -fPIC $LANGUAGE_COMPILE_FLAGS $ARCH_FLAGS $LINK_FLAGS -shared $SONAME_FLAG$SONAME -o $TARGET_FILE $in $LINK_PATH $LINK_LIBRARIES && $POST_BUILD + command = $PRE_LINK && /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang --target=aarch64-none-linux-android22 --gcc-toolchain=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64 --sysroot=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -fPIC $LANGUAGE_COMPILE_FLAGS $ARCH_FLAGS $LINK_FLAGS -shared $SONAME_FLAG$SONAME -o $TARGET_FILE $in $LINK_PATH $LINK_LIBRARIES && $POST_BUILD description = Linking C shared library $TARGET_FILE restat = $RESTAT @@ -42,7 +42,7 @@ rule C_SHARED_LIBRARY_LINKER__djivideojni # Rule for re-running cmake. rule RERUN_CMAKE - command = /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -H/home/smartdrone/Working_Private/rosettadrone_work/app -B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a + command = /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake -H/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app -B/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/arm64-v8a description = Re-running CMake... generator = 1 @@ -51,7 +51,7 @@ rule RERUN_CMAKE # Rule for cleaning all built files. rule CLEAN - command = /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja -t clean + command = /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -t clean description = Cleaning all built files... @@ -59,6 +59,6 @@ rule CLEAN # Rule for printing all primary targets available. rule HELP - command = /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja -t targets + command = /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -t targets description = All primary targets available: diff --git a/app/.cxx/cmake/release/armeabi-v7a/CMakeCache.txt b/app/.cxx/cmake/release/armeabi-v7a/CMakeCache.txt index 23acce0..41228c4 100644 --- a/app/.cxx/cmake/release/armeabi-v7a/CMakeCache.txt +++ b/app/.cxx/cmake/release/armeabi-v7a/CMakeCache.txt @@ -1,6 +1,6 @@ # This is the CMakeCache file. -# For build in directory: /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a -# It was generated by CMake: /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake +# For build in directory: /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a +# It was generated by CMake: /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. # If you do want to change a value, simply edit, save, and exit the editor. @@ -18,13 +18,19 @@ ANDROID_ABI:UNINITIALIZED=armeabi-v7a //No help, variable specified on the command line. -ANDROID_NDK:UNINITIALIZED=/home/smartdrone/Android/Sdk/ndk/21.3.6528147 +ANDROID_NDK:UNINITIALIZED=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 //No help, variable specified on the command line. ANDROID_PLATFORM:UNINITIALIZED=android-22 +//No help, variable specified on the command line. +CMAKE_ANDROID_ARCH_ABI:UNINITIALIZED=armeabi-v7a + +//No help, variable specified on the command line. +CMAKE_ANDROID_NDK:UNINITIALIZED=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 + //Archiver -CMAKE_AR:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ar +CMAKE_AR:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-ar //Flags used by the compiler during all build types. CMAKE_ASM_FLAGS:STRING= @@ -39,6 +45,12 @@ CMAKE_ASM_FLAGS_RELEASE:STRING= // CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel. CMAKE_BUILD_TYPE:STRING=Release +//LLVM archiver +CMAKE_CXX_COMPILER_AR:FILEPATH=CMAKE_CXX_COMPILER_AR-NOTFOUND + +//Generate index for LLVM archive +CMAKE_CXX_COMPILER_RANLIB:FILEPATH=CMAKE_CXX_COMPILER_RANLIB-NOTFOUND + //Flags used by the compiler during all build types. CMAKE_CXX_FLAGS:STRING= @@ -58,6 +70,12 @@ CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG //Libraries linked by default with all C++ applications. CMAKE_CXX_STANDARD_LIBRARIES:STRING=-latomic -lm +//LLVM archiver +CMAKE_C_COMPILER_AR:FILEPATH=CMAKE_C_COMPILER_AR-NOTFOUND + +//Generate index for LLVM archive +CMAKE_C_COMPILER_RANLIB:FILEPATH=CMAKE_C_COMPILER_RANLIB-NOTFOUND + //Flags used by the compiler during all build types. CMAKE_C_FLAGS:STRING= @@ -93,19 +111,22 @@ CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING= CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Enable/Disable output of compile commands during generation. -CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF +CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON + +//No help, variable specified on the command line. +CMAKE_FIND_ROOT_PATH:UNINITIALIZED=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/prefab/armeabi-v7a/prefab //Install path prefix, prepended onto install directories. CMAKE_INSTALL_PREFIX:PATH=/usr/local //No help, variable specified on the command line. -CMAKE_LIBRARY_OUTPUT_DIRECTORY:UNINITIALIZED=/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj/armeabi-v7a +CMAKE_LIBRARY_OUTPUT_DIRECTORY:UNINITIALIZED=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/release/obj/armeabi-v7a //Path to a program. -CMAKE_LINKER:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ld +CMAKE_LINKER:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-ld //No help, variable specified on the command line. -CMAKE_MAKE_PROGRAM:UNINITIALIZED=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja +CMAKE_MAKE_PROGRAM:UNINITIALIZED=/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja //Flags used by the linker during the creation of modules. CMAKE_MODULE_LINKER_FLAGS:STRING= @@ -123,19 +144,19 @@ CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Path to a program. -CMAKE_NM:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-nm +CMAKE_NM:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-nm //Path to a program. -CMAKE_OBJCOPY:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-objcopy +CMAKE_OBJCOPY:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-objcopy //Path to a program. -CMAKE_OBJDUMP:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-objdump +CMAKE_OBJDUMP:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-objdump //Value Computed by CMake CMAKE_PROJECT_NAME:STATIC=Project //Ranlib -CMAKE_RANLIB:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ranlib +CMAKE_RANLIB:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-ranlib //Flags used by the linker during the creation of dll's. CMAKE_SHARED_LINKER_FLAGS:STRING= @@ -175,10 +196,16 @@ CMAKE_STATIC_LINKER_FLAGS_RELEASE:STRING= CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Path to a program. -CMAKE_STRIP:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-strip +CMAKE_STRIP:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/arm-linux-androideabi-strip + +//No help, variable specified on the command line. +CMAKE_SYSTEM_NAME:UNINITIALIZED=Android + +//No help, variable specified on the command line. +CMAKE_SYSTEM_VERSION:UNINITIALIZED=22 //The CMake toolchain file -CMAKE_TOOLCHAIN_FILE:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake +CMAKE_TOOLCHAIN_FILE:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake //If this value is on, makefiles will be generated without the // .SILENT directive, and all commands will be echoed to the console @@ -187,16 +214,16 @@ CMAKE_TOOLCHAIN_FILE:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/buil CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE //Value Computed by CMake -Project_BINARY_DIR:STATIC=/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a +Project_BINARY_DIR:STATIC=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a //Value Computed by CMake -Project_SOURCE_DIR:STATIC=/home/smartdrone/Working_Private/rosettadrone_work/app +Project_SOURCE_DIR:STATIC=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app //Dependencies for the target -djivideojni_LIB_DEPENDS:STATIC=general;ffmpegjni;general;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/22/liblog.so; +djivideojni_LIB_DEPENDS:STATIC=general;ffmpegjni;general;/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi/22/liblog.so; //Path to a library. -log-lib:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/22/liblog.so +log-lib:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi/22/liblog.so ######################## @@ -206,19 +233,23 @@ log-lib:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/p //ADVANCED property for variable: CMAKE_AR CMAKE_AR-ADVANCED:INTERNAL=1 //This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a +CMAKE_CACHEFILE_DIR:INTERNAL=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3 //Minor version of cmake used to create the current loaded cache -CMAKE_CACHE_MINOR_VERSION:INTERNAL=6 +CMAKE_CACHE_MINOR_VERSION:INTERNAL=10 //Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=0 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=2 //Path to CMake executable. -CMAKE_COMMAND:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake +CMAKE_COMMAND:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake //Path to cpack program executable. -CMAKE_CPACK_COMMAND:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cpack +CMAKE_CPACK_COMMAND:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cpack //Path to ctest program executable. -CMAKE_CTEST_COMMAND:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ctest +CMAKE_CTEST_COMMAND:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/ctest +//ADVANCED property for variable: CMAKE_CXX_COMPILER_AR +CMAKE_CXX_COMPILER_AR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_CXX_COMPILER_RANLIB +CMAKE_CXX_COMPILER_RANLIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG @@ -231,6 +262,10 @@ CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1 CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_STANDARD_LIBRARIES CMAKE_CXX_STANDARD_LIBRARIES-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_COMPILER_AR +CMAKE_C_COMPILER_AR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_COMPILER_RANLIB +CMAKE_C_COMPILER_RANLIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_C_FLAGS CMAKE_C_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG @@ -256,7 +291,7 @@ CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1 //Name of external makefile project generator. -CMAKE_EXTRA_GENERATOR:INTERNAL=Android Gradle +CMAKE_EXTRA_GENERATOR:INTERNAL= //Name of generator. CMAKE_GENERATOR:INTERNAL=Ninja //Name of generator platform. @@ -265,9 +300,9 @@ CMAKE_GENERATOR_PLATFORM:INTERNAL= CMAKE_GENERATOR_TOOLSET:INTERNAL= //Source directory with the top level CMakeLists.txt file for this // project -CMAKE_HOME_DIRECTORY:INTERNAL=/home/smartdrone/Working_Private/rosettadrone_work/app +CMAKE_HOME_DIRECTORY:INTERNAL=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app //Install .so files without execute permission. -CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1 +CMAKE_INSTALL_SO_NO_EXE:INTERNAL=0 //ADVANCED property for variable: CMAKE_LINKER CMAKE_LINKER-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS @@ -288,10 +323,12 @@ CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1 CMAKE_OBJCOPY-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_OBJDUMP CMAKE_OBJDUMP-ADVANCED:INTERNAL=1 +//Platform information initialized +CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1 //ADVANCED property for variable: CMAKE_RANLIB CMAKE_RANLIB-ADVANCED:INTERNAL=1 //Path to CMake installation. -CMAKE_ROOT:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6 +CMAKE_ROOT:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG @@ -319,7 +356,7 @@ CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_STRIP CMAKE_STRIP-ADVANCED:INTERNAL=1 //uname command -CMAKE_UNAME:INTERNAL=/bin/uname +CMAKE_UNAME:INTERNAL=/usr/bin/uname //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 diff --git a/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake b/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake deleted file mode 100644 index b267abf..0000000 --- a/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake +++ /dev/null @@ -1,67 +0,0 @@ -set(CMAKE_C_COMPILER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang") -set(CMAKE_C_COMPILER_ARG1 "") -set(CMAKE_C_COMPILER_ID "Clang") -set(CMAKE_C_COMPILER_VERSION "9.0") -set(CMAKE_C_COMPILER_WRAPPER "") -set(CMAKE_C_STANDARD_COMPUTED_DEFAULT "11") -set(CMAKE_C_COMPILE_FEATURES "c_function_prototypes;c_restrict;c_variadic_macros;c_static_assert") -set(CMAKE_C90_COMPILE_FEATURES "c_function_prototypes") -set(CMAKE_C99_COMPILE_FEATURES "c_restrict;c_variadic_macros") -set(CMAKE_C11_COMPILE_FEATURES "c_static_assert") - -set(CMAKE_C_PLATFORM_ID "") -set(CMAKE_C_SIMULATE_ID "") -set(CMAKE_C_SIMULATE_VERSION "") - -set(CMAKE_AR "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ar") -set(CMAKE_RANLIB "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ranlib") -set(CMAKE_LINKER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ld") -set(CMAKE_COMPILER_IS_GNUCC ) -set(CMAKE_C_COMPILER_LOADED 1) -set(CMAKE_C_COMPILER_WORKS TRUE) -set(CMAKE_C_ABI_COMPILED TRUE) -set(CMAKE_COMPILER_IS_MINGW ) -set(CMAKE_COMPILER_IS_CYGWIN ) -if(CMAKE_COMPILER_IS_CYGWIN) - set(CYGWIN 1) - set(UNIX 1) -endif() - -set(CMAKE_C_COMPILER_ENV_VAR "CC") - -if(CMAKE_COMPILER_IS_MINGW) - set(MINGW 1) -endif() -set(CMAKE_C_COMPILER_ID_RUN 1) -set(CMAKE_C_SOURCE_FILE_EXTENSIONS c;m) -set(CMAKE_C_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC) -set(CMAKE_C_LINKER_PREFERENCE 10) - -# Save compiler ABI information. -set(CMAKE_C_SIZEOF_DATA_PTR "4") -set(CMAKE_C_COMPILER_ABI "ELF") -set(CMAKE_C_LIBRARY_ARCHITECTURE "") - -if(CMAKE_C_SIZEOF_DATA_PTR) - set(CMAKE_SIZEOF_VOID_P "${CMAKE_C_SIZEOF_DATA_PTR}") -endif() - -if(CMAKE_C_COMPILER_ABI) - set(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_C_COMPILER_ABI}") -endif() - -if(CMAKE_C_LIBRARY_ARCHITECTURE) - set(CMAKE_LIBRARY_ARCHITECTURE "") -endif() - -set(CMAKE_C_CL_SHOWINCLUDES_PREFIX "") -if(CMAKE_C_CL_SHOWINCLUDES_PREFIX) - set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_C_CL_SHOWINCLUDES_PREFIX}") -endif() - - - - -set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "dl;c;dl") -set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/9.0.8/lib/linux/arm;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/arm-linux-androideabi/lib/armv7-a/thumb;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/22;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib") -set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "") diff --git a/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake b/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake deleted file mode 100644 index da24ebc..0000000 --- a/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake +++ /dev/null @@ -1,68 +0,0 @@ -set(CMAKE_CXX_COMPILER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++") -set(CMAKE_CXX_COMPILER_ARG1 "") -set(CMAKE_CXX_COMPILER_ID "Clang") -set(CMAKE_CXX_COMPILER_VERSION "9.0") -set(CMAKE_CXX_COMPILER_WRAPPER "") -set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT "14") -set(CMAKE_CXX_COMPILE_FEATURES "cxx_template_template_parameters;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates") -set(CMAKE_CXX98_COMPILE_FEATURES "cxx_template_template_parameters") -set(CMAKE_CXX11_COMPILE_FEATURES "cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates") -set(CMAKE_CXX14_COMPILE_FEATURES "cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates") - -set(CMAKE_CXX_PLATFORM_ID "") -set(CMAKE_CXX_SIMULATE_ID "") -set(CMAKE_CXX_SIMULATE_VERSION "") - -set(CMAKE_AR "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ar") -set(CMAKE_RANLIB "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ranlib") -set(CMAKE_LINKER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-ld") -set(CMAKE_COMPILER_IS_GNUCXX ) -set(CMAKE_CXX_COMPILER_LOADED 1) -set(CMAKE_CXX_COMPILER_WORKS TRUE) -set(CMAKE_CXX_ABI_COMPILED TRUE) -set(CMAKE_COMPILER_IS_MINGW ) -set(CMAKE_COMPILER_IS_CYGWIN ) -if(CMAKE_COMPILER_IS_CYGWIN) - set(CYGWIN 1) - set(UNIX 1) -endif() - -set(CMAKE_CXX_COMPILER_ENV_VAR "CXX") - -if(CMAKE_COMPILER_IS_MINGW) - set(MINGW 1) -endif() -set(CMAKE_CXX_COMPILER_ID_RUN 1) -set(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC) -set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;mm;CPP) -set(CMAKE_CXX_LINKER_PREFERENCE 30) -set(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1) - -# Save compiler ABI information. -set(CMAKE_CXX_SIZEOF_DATA_PTR "4") -set(CMAKE_CXX_COMPILER_ABI "ELF") -set(CMAKE_CXX_LIBRARY_ARCHITECTURE "") - -if(CMAKE_CXX_SIZEOF_DATA_PTR) - set(CMAKE_SIZEOF_VOID_P "${CMAKE_CXX_SIZEOF_DATA_PTR}") -endif() - -if(CMAKE_CXX_COMPILER_ABI) - set(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_CXX_COMPILER_ABI}") -endif() - -if(CMAKE_CXX_LIBRARY_ARCHITECTURE) - set(CMAKE_LIBRARY_ARCHITECTURE "") -endif() - -set(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX "") -if(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX) - set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_CXX_CL_SHOWINCLUDES_PREFIX}") -endif() - - - - -set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "c++;m;dl;c;dl") -set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/9.0.8/lib/linux/arm;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a/thumb;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/arm-linux-androideabi/lib/armv7-a/thumb;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/22;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib") -set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "") diff --git a/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin b/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin deleted file mode 100755 index 23e9d85..0000000 Binary files a/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin and /dev/null differ diff --git a/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin b/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin deleted file mode 100755 index 4982b53..0000000 Binary files a/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin and /dev/null differ diff --git a/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeSystem.cmake b/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeSystem.cmake deleted file mode 100644 index 85af0ef..0000000 --- a/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/3.6.0-rc2/CMakeSystem.cmake +++ /dev/null @@ -1,15 +0,0 @@ -set(CMAKE_HOST_SYSTEM "Linux-4.15.0-112-generic") -set(CMAKE_HOST_SYSTEM_NAME "Linux") -set(CMAKE_HOST_SYSTEM_VERSION "4.15.0-112-generic") -set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64") - -include("/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake") - -set(CMAKE_SYSTEM "Android-1") -set(CMAKE_SYSTEM_NAME "Android") -set(CMAKE_SYSTEM_VERSION "1") -set(CMAKE_SYSTEM_PROCESSOR "armv7-a") - -set(CMAKE_CROSSCOMPILING "TRUE") - -set(CMAKE_SYSTEM_LOADED 1) diff --git a/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/TargetDirectories.txt b/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/TargetDirectories.txt index 396d538..cf80eba 100644 --- a/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/TargetDirectories.txt +++ b/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/TargetDirectories.txt @@ -1,3 +1,3 @@ -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/rebuild_cache.dir -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/edit_cache.dir -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/djivideojni.dir +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/rebuild_cache.dir +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/edit_cache.dir +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/djivideojni.dir diff --git a/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/feature_tests.bin b/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/feature_tests.bin index 8fef20c..a101c0e 100755 Binary files a/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/feature_tests.bin and b/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/feature_tests.bin differ diff --git a/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/feature_tests.cxx b/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/feature_tests.cxx index a9b4791..703b335 100644 --- a/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/feature_tests.cxx +++ b/app/.cxx/cmake/release/armeabi-v7a/CMakeFiles/feature_tests.cxx @@ -1,35 +1,35 @@ const char features[] = {"\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_aggregate_nsdmi) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_aggregate_nsdmi) "1" #else "0" #endif "cxx_aggregate_default_initializers\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_alias_templates) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_alias_templates) "1" #else "0" #endif "cxx_alias_templates\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_alignas) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_alignas) "1" #else "0" #endif "cxx_alignas\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_alignas) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_alignas) "1" #else "0" #endif "cxx_alignof\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_attributes) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_attributes) "1" #else "0" @@ -43,35 +43,35 @@ #endif "cxx_attribute_deprecated\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_auto_type) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_auto_type) "1" #else "0" #endif "cxx_auto_type\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_binary_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_binary_literals) "1" #else "0" #endif "cxx_binary_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_constexpr) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_constexpr) "1" #else "0" #endif "cxx_constexpr\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_contextual_conversions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_contextual_conversions) "1" #else "0" #endif "cxx_contextual_conversions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_decltype) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_decltype) "1" #else "0" @@ -85,42 +85,42 @@ #endif "cxx_decltype_auto\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_decltype_incomplete_return_types) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_decltype_incomplete_return_types) "1" #else "0" #endif "cxx_decltype_incomplete_return_types\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_default_function_template_args) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_default_function_template_args) "1" #else "0" #endif "cxx_default_function_template_args\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_defaulted_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_defaulted_functions) "1" #else "0" #endif "cxx_defaulted_functions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_defaulted_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_defaulted_functions) "1" #else "0" #endif "cxx_defaulted_move_initializers\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_delegating_constructors) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_delegating_constructors) "1" #else "0" #endif "cxx_delegating_constructors\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_deleted_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_deleted_functions) "1" #else "0" @@ -134,49 +134,49 @@ #endif "cxx_digit_separators\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_enum_forward_declarations\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_explicit_conversions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_explicit_conversions) "1" #else "0" #endif "cxx_explicit_conversions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_extended_friend_declarations\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_extern_templates\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_override_control) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_override_control) "1" #else "0" #endif "cxx_final\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_func_identifier\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_generalized_initializers) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_generalized_initializers) "1" #else "0" @@ -190,210 +190,210 @@ #endif "cxx_generic_lambdas\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_inheriting_constructors) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_inheriting_constructors) "1" #else "0" #endif "cxx_inheriting_constructors\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_inline_namespaces\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_lambdas) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_lambdas) "1" #else "0" #endif "cxx_lambdas\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_init_captures) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_init_captures) "1" #else "0" #endif "cxx_lambda_init_captures\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_local_type_template_args) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_local_type_template_args) "1" #else "0" #endif "cxx_local_type_template_args\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_long_long_type\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_noexcept) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_noexcept) "1" #else "0" #endif "cxx_noexcept\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_nonstatic_member_init) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_nonstatic_member_init) "1" #else "0" #endif "cxx_nonstatic_member_init\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_nullptr) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_nullptr) "1" #else "0" #endif "cxx_nullptr\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_override_control) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_override_control) "1" #else "0" #endif "cxx_override\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_range_for) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_range_for) "1" #else "0" #endif "cxx_range_for\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_raw_string_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_raw_string_literals) "1" #else "0" #endif "cxx_raw_string_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_reference_qualified_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_reference_qualified_functions) "1" #else "0" #endif "cxx_reference_qualified_functions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_relaxed_constexpr) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_relaxed_constexpr) "1" #else "0" #endif "cxx_relaxed_constexpr\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_return_type_deduction) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_return_type_deduction) "1" #else "0" #endif "cxx_return_type_deduction\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_right_angle_brackets\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_rvalue_references) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_rvalue_references) "1" #else "0" #endif "cxx_rvalue_references\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_sizeof_member\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_static_assert) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_static_assert) "1" #else "0" #endif "cxx_static_assert\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_strong_enums) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_strong_enums) "1" #else "0" #endif "cxx_strong_enums\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 199711L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 199711L "1" #else "0" #endif "cxx_template_template_parameters\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_thread_local) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_thread_local) "1" #else "0" #endif "cxx_thread_local\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_trailing_return) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_trailing_return) "1" #else "0" #endif "cxx_trailing_return_types\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_unicode_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_unicode_literals) "1" #else "0" #endif "cxx_unicode_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_generalized_initializers) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_generalized_initializers) "1" #else "0" #endif "cxx_uniform_initialization\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_unrestricted_unions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_unrestricted_unions) "1" #else "0" #endif "cxx_unrestricted_unions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_user_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_user_literals) "1" #else "0" #endif "cxx_user_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_variable_templates) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_variable_templates) "1" #else "0" #endif "cxx_variable_templates\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_variadic_macros\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_variadic_templates) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_variadic_templates) "1" #else "0" diff --git a/app/.cxx/cmake/release/armeabi-v7a/android_gradle_build.json b/app/.cxx/cmake/release/armeabi-v7a/android_gradle_build.json index 4fb6d98..1e7d8a2 100644 --- a/app/.cxx/cmake/release/armeabi-v7a/android_gradle_build.json +++ b/app/.cxx/cmake/release/armeabi-v7a/android_gradle_build.json @@ -1,65 +1,45 @@ - { - "buildFiles" : - [ - "/home/smartdrone/Working_Private/rosettadrone_work/app/CMakeLists.txt" - ], - "cFileExtensions" : [ "c" ], - "cleanCommands" : - [ - "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a --target clean" - ], - "libraries" : - { - "c++_shared-Release-armeabi-v7a" : - { - "abi" : "armeabi-v7a", - "artifactName" : "c++_shared", - "buildType" : "release", - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/armeabi-v7a/libc++_shared.so.27", - "toolchain" : "6038786665986016389" - }, - "djivideojni-Release-armeabi-v7a" : - { - "abi" : "armeabi-v7a", - "artifactName" : "djivideojni", - "buildCommand" : "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a --target djivideojni", - "buildType" : "release", - "files" : - [ - - { - "flags" : " --target=armv7-none-linux-androideabi22 --gcc-toolchain=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64 --sysroot=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot -Ddjivideojni_EXPORTS -I../../../../src/main/cpp -I../../../../src/main/cpp/include -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/gstreamer-1.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/glib-2.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/lib/glib-2.0/include -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -march=armv7-a -mthumb -Wformat -Werror=format-security -Oz -DNDEBUG -fPIC -c ", - "src" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/dji_video_jni.c", - "workingDirectory" : "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a" - } - ], - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj/armeabi-v7a/libdjivideojni.so", - "toolchain" : "6038786665986016389" - }, - "ffmpegjni-Release-armeabi-v7a" : - { - "abi" : "armeabi-v7a", - "artifactName" : "ffmpegjni", - "buildType" : "release", - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/armeabi-v7a/libffmpeg.so", - "toolchain" : "6038786665986016389" - }, - "gstreamer_android-Release-armeabi-v7a" : - { - "abi" : "armeabi-v7a", - "artifactName" : "gstreamer_android", - "buildType" : "release", - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/armeabi-v7a/libgstreamer_android.so", - "toolchain" : "6038786665986016389" - } - }, - "toolchains" : - { - "6038786665986016389" : - { - "cCompilerExecutable" : "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang", - "cppCompilerExecutable" : "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++" - } - } -} + "stringTable": { + "0": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a", + "1": "--target=armv7-none-linux-androideabi22 --gcc-toolchain=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64 --sysroot=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -Ddjivideojni_EXPORTS -I../../../../src/main/cpp -I../../../../src/main/cpp/include -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/gstreamer-1.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/glib-2.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/lib/glib-2.0/include -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -fno-addrsig -march=armv7-a -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -Oz -DNDEBUG -fPIC" + }, + "buildFiles": [ + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake" + ], + "cleanCommands": [ + "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a\" clean" + ], + "buildTargetsCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a\" {LIST_OF_TARGETS_TO_BUILD}", + "libraries": { + "djivideojni-Release-armeabi-v7a": { + "buildCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a\" djivideojni", + "buildType": "release", + "toolchain": "3669181217", + "abi": "armeabi-v7a", + "artifactName": "djivideojni", + "files": [ + { + "src": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/src/main/cpp/dji_video_jni.c", + "flagsOrdinal": 1, + "workingDirectoryOrdinal": 0 + } + ], + "headers": [], + "output": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/release/obj/armeabi-v7a/libdjivideojni.so", + "runtimeFiles": [ + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/src/main/cpp/lib/armeabi-v7a/libffmpeg.so" + ] + } + }, + "toolchains": { + "3669181217": { + "cCompilerExecutable": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang" + } + }, + "cFileExtensions": [ + "c" + ], + "cppFileExtensions": [] +} \ No newline at end of file diff --git a/app/.cxx/cmake/release/armeabi-v7a/android_gradle_build_mini.json b/app/.cxx/cmake/release/armeabi-v7a/android_gradle_build_mini.json index 881d2dc..a2cb67a 100644 --- a/app/.cxx/cmake/release/armeabi-v7a/android_gradle_build_mini.json +++ b/app/.cxx/cmake/release/armeabi-v7a/android_gradle_build_mini.json @@ -1,31 +1,22 @@ { "buildFiles": [ - "/home/smartdrone/Working_Private/rosettadrone_work/app/CMakeLists.txt" + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake" ], "cleanCommands": [ - "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a --target clean" + "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a\" clean" ], + "buildTargetsCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a\" {LIST_OF_TARGETS_TO_BUILD}", "libraries": { "djivideojni-Release-armeabi-v7a": { "artifactName": "djivideojni", - "buildCommand": "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a --target djivideojni", + "buildCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a\" djivideojni", "abi": "armeabi-v7a", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj/armeabi-v7a/libdjivideojni.so" - }, - "c++_shared-Release-armeabi-v7a": { - "artifactName": "c++_shared", - "abi": "armeabi-v7a", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/armeabi-v7a/libc++_shared.so.27" - }, - "ffmpegjni-Release-armeabi-v7a": { - "artifactName": "ffmpegjni", - "abi": "armeabi-v7a", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/armeabi-v7a/libffmpeg.so" - }, - "gstreamer_android-Release-armeabi-v7a": { - "artifactName": "gstreamer_android", - "abi": "armeabi-v7a", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/armeabi-v7a/libgstreamer_android.so" + "output": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/release/obj/armeabi-v7a/libdjivideojni.so", + "runtimeFiles": [ + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/src/main/cpp/lib/armeabi-v7a/libffmpeg.so" + ] } } } \ No newline at end of file diff --git a/app/.cxx/cmake/release/armeabi-v7a/android_gradle_generate_cmake_ninja_json_armeabi-v7a.command.txt b/app/.cxx/cmake/release/armeabi-v7a/android_gradle_generate_cmake_ninja_json_armeabi-v7a.command.txt deleted file mode 100644 index 0eaf866..0000000 --- a/app/.cxx/cmake/release/armeabi-v7a/android_gradle_generate_cmake_ninja_json_armeabi-v7a.command.txt +++ /dev/null @@ -1,14 +0,0 @@ -Executable : /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -arguments : --H/home/smartdrone/Working_Private/rosettadrone_work/app --B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a --DANDROID_ABI=armeabi-v7a --DANDROID_PLATFORM=android-22 --DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj/armeabi-v7a --DCMAKE_BUILD_TYPE=Release --DANDROID_NDK=/home/smartdrone/Android/Sdk/ndk/21.3.6528147 --DCMAKE_TOOLCHAIN_FILE=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake --DCMAKE_MAKE_PROGRAM=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja --GAndroid Gradle - Ninja -jvmArgs : - diff --git a/app/.cxx/cmake/release/armeabi-v7a/android_gradle_generate_cmake_ninja_json_armeabi-v7a.stderr.txt b/app/.cxx/cmake/release/armeabi-v7a/android_gradle_generate_cmake_ninja_json_armeabi-v7a.stderr.txt deleted file mode 100644 index e69de29..0000000 diff --git a/app/.cxx/cmake/release/armeabi-v7a/android_gradle_generate_cmake_ninja_json_armeabi-v7a.stdout.txt b/app/.cxx/cmake/release/armeabi-v7a/android_gradle_generate_cmake_ninja_json_armeabi-v7a.stdout.txt deleted file mode 100644 index dd5a6cf..0000000 --- a/app/.cxx/cmake/release/armeabi-v7a/android_gradle_generate_cmake_ninja_json_armeabi-v7a.stdout.txt +++ /dev/null @@ -1,15 +0,0 @@ --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -- works --- Detecting C compiler ABI info --- Detecting C compiler ABI info - done --- Detecting C compile features --- Detecting C compile features - done --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -- works --- Detecting CXX compiler ABI info --- Detecting CXX compiler ABI info - done --- Detecting CXX compile features --- Detecting CXX compile features - done --- Configuring done --- Generating done --- Build files have been written to: /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a diff --git a/app/.cxx/cmake/release/armeabi-v7a/build.ninja b/app/.cxx/cmake/release/armeabi-v7a/build.ninja index e3aa154..5e3e713 100644 --- a/app/.cxx/cmake/release/armeabi-v7a/build.ninja +++ b/app/.cxx/cmake/release/armeabi-v7a/build.ninja @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Ninja" Generator, CMake Version 3.6 +# Generated by "Ninja" Generator, CMake Version 3.10 # This file contains all the build statements describing the # compilation DAG. @@ -34,7 +34,7 @@ include rules.ninja # Utility command for rebuild_cache build CMakeFiles/rebuild_cache.util: CUSTOM_COMMAND - COMMAND = cd /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a && /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -H/home/smartdrone/Working_Private/rosettadrone_work/app -B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a + COMMAND = cd /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a && /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake -H/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app -B/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a DESC = Running CMake to regenerate build system... pool = console restat = 1 @@ -44,19 +44,23 @@ build rebuild_cache: phony CMakeFiles/rebuild_cache.util # Utility command for edit_cache build CMakeFiles/edit_cache.util: CUSTOM_COMMAND - COMMAND = cd /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a && /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. + COMMAND = cd /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a && /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. DESC = No interactive CMake dialog available... restat = 1 build edit_cache: phony CMakeFiles/edit_cache.util # ============================================================================= # Object build statements for SHARED_LIBRARY target djivideojni -build CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o: C_COMPILER__djivideojni ../../../../src/main/cpp/dji_video_jni.c + +############################################# +# Order-only phony target for djivideojni + +build cmake_object_order_depends_target_djivideojni: phony +build CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o: C_COMPILER__djivideojni ../../../../src/main/cpp/dji_video_jni.c || cmake_object_order_depends_target_djivideojni DEFINES = -Ddjivideojni_EXPORTS DEP_FILE = CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o.d - FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -march=armv7-a -mthumb -Wformat -Werror=format-security -Oz -DNDEBUG -fPIC + FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -fno-addrsig -march=armv7-a -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -Oz -DNDEBUG -fPIC INCLUDES = -I../../../../src/main/cpp -I../../../../src/main/cpp/include -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/gstreamer-1.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/glib-2.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/lib/glib-2.0/include - IN_ABS = /home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/dji_video_jni.c OBJECT_DIR = CMakeFiles/djivideojni.dir OBJECT_FILE_DIR = CMakeFiles/djivideojni.dir/src/main/cpp @@ -67,10 +71,10 @@ build CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o: C_COMPILER__dji ############################################# # Link the shared library ../../../../build/intermediates/cmake/release/obj/armeabi-v7a/libdjivideojni.so -build ../../../../build/intermediates/cmake/release/obj/armeabi-v7a/libdjivideojni.so: C_SHARED_LIBRARY_LINKER__djivideojni CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o | ../../../../src/main/cpp/lib/armeabi-v7a/libffmpeg.so /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/22/liblog.so - LANGUAGE_COMPILE_FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -D_FORTIFY_SOURCE=2 -march=armv7-a -mthumb -Wformat -Werror=format-security -Oz -DNDEBUG - LINK_FLAGS = -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libgcc_real.a -Wl,--exclude-libs,libatomic.a -static-libstdc++ -Wl,--build-id -Wl,--fatal-warnings -Wl,--exclude-libs,libunwind.a -Wl,--no-undefined -Qunused-arguments - LINK_LIBRARIES = ../../../../src/main/cpp/lib/armeabi-v7a/libffmpeg.so /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/22/liblog.so -latomic -lm +build ../../../../build/intermediates/cmake/release/obj/armeabi-v7a/libdjivideojni.so: C_SHARED_LIBRARY_LINKER__djivideojni CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o | ../../../../src/main/cpp/lib/armeabi-v7a/libffmpeg.so /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi/22/liblog.so + LANGUAGE_COMPILE_FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -fno-addrsig -march=armv7-a -mthumb -Wa,--noexecstack -Wformat -Werror=format-security -Oz -DNDEBUG + LINK_FLAGS = -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -static-libstdc++ -Wl,--build-id -Wl,--warn-shared-textrel -Wl,--fatal-warnings -Wl,--exclude-libs,libunwind.a -Wl,--no-undefined -Qunused-arguments -Wl,-z,noexecstack + LINK_LIBRARIES = ../../../../src/main/cpp/lib/armeabi-v7a/libffmpeg.so -llog -latomic -lm OBJECT_DIR = CMakeFiles/djivideojni.dir POST_BUILD = : PRE_LINK = : @@ -104,13 +108,13 @@ default all ############################################# # Re-run CMake if any of its inputs changed. -build build.ninja: RERUN_CMAKE | ../../../../CMakeLists.txt /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompilerABI.c /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompilerABI.cpp /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCommonLanguageInclude.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompileFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompilerABI.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeFindBinUtils.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeGenericSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeLanguageInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeParseImplicitLinkInfo.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystem.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInitialize.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCompilerCommon.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/GNU.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Internal/FeatureTesting.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Android.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Linux.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/UnixPaths.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/platforms.cmake CMakeCache.txt CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx +build build.ninja: RERUN_CMAKE | ../../../../CMakeLists.txt /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompilerABI.c /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompilerABI.cpp /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCommonLanguageInclude.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompileFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompilerABI.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeFindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeGenericSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeLanguageInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeParseImplicitLinkInfo.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystem.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInitialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCompilerCommon.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/CMakeCommonCompilerMacros.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-FindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/GNU.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Internal/FeatureTesting.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Initialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android/Determine-Compiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Linux.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/UnixPaths.cmake CMakeCache.txt CMakeFiles/3.10.2/CMakeCCompiler.cmake CMakeFiles/3.10.2/CMakeCXXCompiler.cmake CMakeFiles/3.10.2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx pool = console ############################################# # A missing CMake input file is not an error. -build ../../../../CMakeLists.txt /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompilerABI.c /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompilerABI.cpp /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCommonLanguageInclude.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompileFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompilerABI.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeFindBinUtils.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeGenericSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeLanguageInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeParseImplicitLinkInfo.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystem.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInitialize.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCompilerCommon.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/GNU.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Internal/FeatureTesting.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Android.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Linux.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/UnixPaths.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/platforms.cmake CMakeCache.txt CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx: phony +build ../../../../CMakeLists.txt /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompilerABI.c /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompilerABI.cpp /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCommonLanguageInclude.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompileFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompilerABI.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeFindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeGenericSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeLanguageInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeParseImplicitLinkInfo.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystem.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInitialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCompilerCommon.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/CMakeCommonCompilerMacros.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-FindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/GNU.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Internal/FeatureTesting.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Initialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android/Determine-Compiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Linux.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/UnixPaths.cmake CMakeCache.txt CMakeFiles/3.10.2/CMakeCCompiler.cmake CMakeFiles/3.10.2/CMakeCXXCompiler.cmake CMakeFiles/3.10.2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx: phony ############################################# # Clean all the built files. diff --git a/app/.cxx/cmake/release/armeabi-v7a/build_command.txt b/app/.cxx/cmake/release/armeabi-v7a/build_command.txt index 0eaf866..15d10fa 100644 --- a/app/.cxx/cmake/release/armeabi-v7a/build_command.txt +++ b/app/.cxx/cmake/release/armeabi-v7a/build_command.txt @@ -1,14 +1,21 @@ -Executable : /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake + Executable : /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake arguments : --H/home/smartdrone/Working_Private/rosettadrone_work/app --B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a --DANDROID_ABI=armeabi-v7a --DANDROID_PLATFORM=android-22 --DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj/armeabi-v7a +-H/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app +-DCMAKE_FIND_ROOT_PATH=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/prefab/armeabi-v7a/prefab -DCMAKE_BUILD_TYPE=Release --DANDROID_NDK=/home/smartdrone/Android/Sdk/ndk/21.3.6528147 --DCMAKE_TOOLCHAIN_FILE=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake --DCMAKE_MAKE_PROGRAM=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja --GAndroid Gradle - Ninja +-DCMAKE_TOOLCHAIN_FILE=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake +-DANDROID_ABI=armeabi-v7a +-DANDROID_NDK=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 +-DANDROID_PLATFORM=android-22 +-DCMAKE_ANDROID_ARCH_ABI=armeabi-v7a +-DCMAKE_ANDROID_NDK=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 +-DCMAKE_EXPORT_COMPILE_COMMANDS=ON +-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/release/obj/armeabi-v7a +-DCMAKE_MAKE_PROGRAM=/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja +-DCMAKE_SYSTEM_NAME=Android +-DCMAKE_SYSTEM_VERSION=22 +-B/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a +-GNinja jvmArgs : +Build command args: diff --git a/app/.cxx/cmake/release/armeabi-v7a/build_model.json b/app/.cxx/cmake/release/armeabi-v7a/build_model.json index 8b0fc7f..d11cdb5 100644 --- a/app/.cxx/cmake/release/armeabi-v7a/build_model.json +++ b/app/.cxx/cmake/release/armeabi-v7a/build_model.json @@ -1,69 +1,203 @@ { - "variant": { - "module": { - "rootBuildGradleFolder": "/home/smartdrone/Working_Private/rosettadrone_work", - "sdkFolder": "/home/smartdrone/Android/Sdk", - "isNativeCompilerSettingsCacheEnabled": false, - "isBuildOnlyTargetAbiEnabled": true, - "splitsAbiFilterSet": [], - "intermediatesFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates", - "gradleModulePathName": ":app", - "moduleRootFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app", - "makeFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/CMakeLists.txt", - "buildSystem": "CMAKE", - "compilerSettingsCacheFolder": "/home/smartdrone/Working_Private/rosettadrone_work/.cxx", - "cxxFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx", - "ndkFolder": "/home/smartdrone/Android/Sdk/ndk/21.3.6528147", - "ndkVersion": "21.3.6528147", - "ndkSupportedAbiList": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" + "abi": "ARMEABI_V7A", + "abiPlatformVersion": 22, + "buildSettings": { + "environmentVariables": [] + }, + "cmake": { + "cmakeArtifactsBaseFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a", + "cmakeServerLogFile": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a/cmake_server_log.txt", + "cmakeWrappingBaseFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cxx/release/armeabi-v7a", + "effectiveConfiguration": { + "name": "traditional-android-studio-cmake-environment", + "description": "Composite reified CMakeSettings configuration", + "generator": "Ninja", + "inheritEnvironments": [ + "ndk" ], + "buildRoot": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a", + "cmakeToolchain": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "cmakeExecutable": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake", + "variables": [ + { + "name": "CMAKE_FIND_ROOT_PATH", + "value": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/prefab/armeabi-v7a/prefab" + }, + { + "name": "CMAKE_BUILD_TYPE", + "value": "Release" + }, + { + "name": "CMAKE_TOOLCHAIN_FILE", + "value": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake" + }, + { + "name": "ANDROID_ABI", + "value": "armeabi-v7a" + }, + { + "name": "ANDROID_NDK", + "value": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944" + }, + { + "name": "ANDROID_PLATFORM", + "value": "android-22" + }, + { + "name": "CMAKE_ANDROID_ARCH_ABI", + "value": "armeabi-v7a" + }, + { + "name": "CMAKE_ANDROID_NDK", + "value": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944" + }, + { + "name": "CMAKE_EXPORT_COMPILE_COMMANDS", + "value": "ON" + }, + { + "name": "CMAKE_LIBRARY_OUTPUT_DIRECTORY", + "value": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/release/obj/armeabi-v7a" + }, + { + "name": "CMAKE_MAKE_PROGRAM", + "value": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja" + }, + { + "name": "CMAKE_SYSTEM_NAME", + "value": "Android" + }, + { + "name": "CMAKE_SYSTEM_VERSION", + "value": "22" + } + ] + } + }, + "cxxBuildFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a", + "info": { + "abi": "ARMEABI_V7A", + "bitness": 32, + "deprecated": false, + "default": true + }, + "originalCxxBuildFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a", + "variant": { + "buildSystemArgumentList": [], + "buildTargetSet": [], + "implicitBuildTargetSet": [], + "cFlagsList": [], + "cmakeSettingsConfiguration": "android-gradle-plugin-predetermined-name", + "cppFlagsList": [], + "isDebuggableEnabled": false, + "module": { + "buildSystem": "CMAKE", + "cmake": { + "cmakeExe": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake", + "minimumCmakeVersion": "3.10.2", + "ninjaExe": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja" + }, + "cmakeToolchainFile": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "cxxFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx", + "gradleModulePathName": ":app", + "intermediatesFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates", + "makeFile": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "moduleBuildFile": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build.gradle", + "moduleRootFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app", "ndkDefaultAbiList": [ "ARMEABI_V7A", "ARM64_V8A", "X86", "X86_64" ], - "cmakeToolchainFile": "." + "ndkFolder": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944", + "ndkMetaAbiList": [ + { + "abi": "ARMEABI_V7A", + "bitness": 32, + "deprecated": false, + "default": true + }, + { + "abi": "ARM64_V8A", + "bitness": 64, + "deprecated": false, + "default": true + }, + { + "abi": "X86", + "bitness": 32, + "deprecated": false, + "default": true + }, + { + "abi": "X86_64", + "bitness": 64, + "deprecated": false, + "default": true + } + ], + "ndkMetaPlatforms": { + "min": 16, + "max": 29, + "aliases": { + "20": 19, + "25": 24, + "J": 16, + "J-MR1": 17, + "J-MR2": 18, + "K": 19, + "L": 21, + "L-MR1": 22, + "M": 23, + "N": 24, + "N-MR1": 24, + "O": 26, + "O-MR1": 27, + "P": 28, + "Q": 29 + } + }, + "ndkSupportedAbiList": [ + "ARMEABI_V7A", + "ARM64_V8A", + "X86", + "X86_64" + ], + "ndkDefaultStl": "LIBCXX_STATIC", + "ndkVersion": "20.1.5948944", + "project": { + "compilerSettingsCacheFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/.cxx", + "cxxFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/.cxx", + "isBuildOnlyTargetAbiEnabled": true, + "isCmakeBuildCohabitationEnabled": false, + "isNativeCompilerSettingsCacheEnabled": false, + "rootBuildGradleFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work", + "sdkFolder": "/Users/teni/Library/Android/sdk", + "isPrefabEnabled": false + }, + "splitsAbiFilterSet": [], + "stlSharedObjectMap": { + "LIBCXX_SHARED": { + "ARMEABI_V7A": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi/libc++_shared.so", + "ARM64_V8A": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so", + "X86": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/i686-linux-android/libc++_shared.so", + "X86_64": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/x86_64-linux-android/libc++_shared.so" + }, + "LIBCXX_STATIC": {}, + "NONE": {}, + "SYSTEM": {} + } }, - "buildSystemArgumentList": [], - "cFlagList": [], - "cppFlagsList": [], + "objFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/release/obj", "variantName": "release", - "soFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/lib", - "objFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj", - "jsonFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release", - "gradleBuildOutputFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release", - "isDebuggableEnabled": false, "validAbiList": [ "ARMEABI_V7A", "ARM64_V8A", "X86" ], - "buildTargetSet": [] + "prefabDirectory": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/prefab", + "prefabPackageDirectoryList": [] }, - "abi": "ARMEABI_V7A", - "abiPlatformVersion": 22, - "cxxBuildFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a", - "jsonFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a/android_gradle_build.json", - "gradleBuildOutputFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/armeabi-v7a", - "objFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj/armeabi-v7a", - "buildCommandFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a/build_command.txt", - "buildOutputFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a/build_output.txt", - "modelOutputFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a/build_model.json", - "cmake": { - "cmakeListsWrapperFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/armeabi-v7a/CMakeLists.txt", - "toolchainWrapperFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/armeabi-v7a/android_gradle_build.toolchain.cmake", - "buildGenerationStateFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/armeabi-v7a/build_generation_state.json", - "cacheKeyFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/armeabi-v7a/compiler_cache_key.json", - "compilerCacheUseFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/armeabi-v7a/compiler_cache_use.json", - "compilerCacheWriteFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/armeabi-v7a/compiler_cache_write.json", - "toolchainSettingsFromCacheFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/armeabi-v7a/compiler_settings_cache.cmake", - "cmakeWrappingBaseFolder": "." - }, - "jsonGenerationLoggingRecordFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a/json_generation_record.json", - "compileCommandsJsonFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a/compile_commands.json" + "prefabFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/prefab/armeabi-v7a" } \ No newline at end of file diff --git a/app/.cxx/cmake/release/armeabi-v7a/build_output.txt b/app/.cxx/cmake/release/armeabi-v7a/build_output.txt index e0c29e5..bc40114 100644 --- a/app/.cxx/cmake/release/armeabi-v7a/build_output.txt +++ b/app/.cxx/cmake/release/armeabi-v7a/build_output.txt @@ -1,15 +1,13 @@ --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -- works --- Detecting C compiler ABI info --- Detecting C compiler ABI info - done --- Detecting C compile features --- Detecting C compile features - done --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -- works --- Detecting CXX compiler ABI info --- Detecting CXX compiler ABI info - done --- Detecting CXX compile features --- Detecting CXX compile features - done --- Configuring done --- Generating done --- Build files have been written to: /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a \ No newline at end of file +Check for working C compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang +Check for working C compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang -- works +Detecting C compiler ABI info +Detecting C compiler ABI info - done +Detecting C compile features +Detecting C compile features - done +Check for working CXX compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ +Check for working CXX compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ -- works +Detecting CXX compiler ABI info +Detecting CXX compiler ABI info - done +Detecting CXX compile features +Detecting CXX compile features - done +Configuring done \ No newline at end of file diff --git a/app/.cxx/cmake/release/armeabi-v7a/cmake_install.cmake b/app/.cxx/cmake/release/armeabi-v7a/cmake_install.cmake index 22fb1b0..c23bd50 100644 --- a/app/.cxx/cmake/release/armeabi-v7a/cmake_install.cmake +++ b/app/.cxx/cmake/release/armeabi-v7a/cmake_install.cmake @@ -1,4 +1,4 @@ -# Install script for directory: /home/smartdrone/Working_Private/rosettadrone_work/app +# Install script for directory: /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app # Set the install prefix if(NOT DEFINED CMAKE_INSTALL_PREFIX) @@ -29,7 +29,12 @@ endif() # Install shared libraries without execute permission? if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) - set(CMAKE_INSTALL_SO_NO_EXE "1") + set(CMAKE_INSTALL_SO_NO_EXE "0") +endif() + +# Is this installation the result of a crosscompile? +if(NOT DEFINED CMAKE_CROSSCOMPILING) + set(CMAKE_CROSSCOMPILING "TRUE") endif() if(CMAKE_INSTALL_COMPONENT) @@ -40,5 +45,5 @@ endif() string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT "${CMAKE_INSTALL_MANIFEST_FILES}") -file(WRITE "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a/${CMAKE_INSTALL_MANIFEST}" +file(WRITE "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a/${CMAKE_INSTALL_MANIFEST}" "${CMAKE_INSTALL_MANIFEST_CONTENT}") diff --git a/app/.cxx/cmake/release/armeabi-v7a/json_generation_record.json b/app/.cxx/cmake/release/armeabi-v7a/json_generation_record.json index 842dc6a..dd24eb0 100644 --- a/app/.cxx/cmake/release/armeabi-v7a/json_generation_record.json +++ b/app/.cxx/cmake/release/armeabi-v7a/json_generation_record.json @@ -1,30 +1,44 @@ [ { "level": "INFO", - "message": "Start JSON generation. Platform version: 22 min SDK version: armeabi-v7a" + "message": "Start JSON generation. Platform version: 22 min SDK version: armeabi-v7a", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|armeabi-v7a" }, { "level": "INFO", - "message": "No CMake version was specified in build.gradle. Choosing a suitable version." + "message": "No CMake version was specified in build.gradle. Using default version 3.10.2.", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|armeabi-v7a" }, { "level": "INFO", - "message": "Trying to locate CMake in local SDK repository." + "message": "Trying to locate CMake in local SDK repository.", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|armeabi-v7a" }, { "level": "INFO", - "message": "CMake \u00273.10.2\u0027 found in SDK did not match requested version \u00273.6.0\u0027." + "message": "- CMake found in SDK at \u0027/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404\u0027 had version \u00273.10.2\u0027", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|armeabi-v7a" }, { "level": "INFO", - "message": "- CMake found in SDK at \u0027/home/smartdrone/Android/Sdk/cmake/3.6.4111459\u0027 had version \u00273.6.0\u0027" + "message": "CMake \u00273.6.0\u0027 found in SDK did not match requested version \u00273.10.2\u0027.", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|armeabi-v7a" }, { "level": "INFO", - "message": "JSON \u0027/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a/android_gradle_build.json\u0027 was up-to-date" + "message": "JSON \u0027/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a/android_gradle_build.json\u0027 was up-to-date", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|armeabi-v7a" }, { "level": "INFO", - "message": "JSON generation completed without problems" + "message": "JSON generation completed without problems", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|armeabi-v7a" } ] \ No newline at end of file diff --git a/app/.cxx/cmake/release/armeabi-v7a/rules.ninja b/app/.cxx/cmake/release/armeabi-v7a/rules.ninja index e32aac9..a80c778 100644 --- a/app/.cxx/cmake/release/armeabi-v7a/rules.ninja +++ b/app/.cxx/cmake/release/armeabi-v7a/rules.ninja @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Ninja" Generator, CMake Version 3.6 +# Generated by "Ninja" Generator, CMake Version 3.10 # This file contains all the rules used to get the outputs files # built from the input files. @@ -25,7 +25,7 @@ rule CUSTOM_COMMAND rule C_COMPILER__djivideojni depfile = $DEP_FILE deps = gcc - command = /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=armv7-none-linux-androideabi22 --gcc-toolchain=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64 --sysroot=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot $DEFINES $INCLUDES $FLAGS -MD -MT $out -MF $DEP_FILE -o $out -c $IN_ABS + command = /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang --target=armv7-none-linux-androideabi22 --gcc-toolchain=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64 --sysroot=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot $DEFINES $INCLUDES $FLAGS -MD -MT $out -MF $DEP_FILE -o $out -c $in description = Building C object $out @@ -33,7 +33,7 @@ rule C_COMPILER__djivideojni # Rule for linking C shared library. rule C_SHARED_LIBRARY_LINKER__djivideojni - command = $PRE_LINK && /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=armv7-none-linux-androideabi22 --gcc-toolchain=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64 --sysroot=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot -fPIC $LANGUAGE_COMPILE_FLAGS $ARCH_FLAGS $LINK_FLAGS -shared $SONAME_FLAG$SONAME -o $TARGET_FILE $in $LINK_PATH $LINK_LIBRARIES && $POST_BUILD + command = $PRE_LINK && /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang --target=armv7-none-linux-androideabi22 --gcc-toolchain=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64 --sysroot=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -fPIC $LANGUAGE_COMPILE_FLAGS $ARCH_FLAGS $LINK_FLAGS -shared $SONAME_FLAG$SONAME -o $TARGET_FILE $in $LINK_PATH $LINK_LIBRARIES && $POST_BUILD description = Linking C shared library $TARGET_FILE restat = $RESTAT @@ -42,7 +42,7 @@ rule C_SHARED_LIBRARY_LINKER__djivideojni # Rule for re-running cmake. rule RERUN_CMAKE - command = /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -H/home/smartdrone/Working_Private/rosettadrone_work/app -B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a + command = /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake -H/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app -B/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/armeabi-v7a description = Re-running CMake... generator = 1 @@ -51,7 +51,7 @@ rule RERUN_CMAKE # Rule for cleaning all built files. rule CLEAN - command = /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja -t clean + command = /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -t clean description = Cleaning all built files... @@ -59,6 +59,6 @@ rule CLEAN # Rule for printing all primary targets available. rule HELP - command = /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja -t targets + command = /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -t targets description = All primary targets available: diff --git a/app/.cxx/cmake/release/x86/CMakeCache.txt b/app/.cxx/cmake/release/x86/CMakeCache.txt index ba6c6f3..c1283a4 100644 --- a/app/.cxx/cmake/release/x86/CMakeCache.txt +++ b/app/.cxx/cmake/release/x86/CMakeCache.txt @@ -1,6 +1,6 @@ # This is the CMakeCache file. -# For build in directory: /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86 -# It was generated by CMake: /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake +# For build in directory: /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86 +# It was generated by CMake: /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. # If you do want to change a value, simply edit, save, and exit the editor. @@ -18,13 +18,19 @@ ANDROID_ABI:UNINITIALIZED=x86 //No help, variable specified on the command line. -ANDROID_NDK:UNINITIALIZED=/home/smartdrone/Android/Sdk/ndk/21.3.6528147 +ANDROID_NDK:UNINITIALIZED=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 //No help, variable specified on the command line. ANDROID_PLATFORM:UNINITIALIZED=android-22 +//No help, variable specified on the command line. +CMAKE_ANDROID_ARCH_ABI:UNINITIALIZED=x86 + +//No help, variable specified on the command line. +CMAKE_ANDROID_NDK:UNINITIALIZED=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 + //Archiver -CMAKE_AR:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ar +CMAKE_AR:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android-ar //Flags used by the compiler during all build types. CMAKE_ASM_FLAGS:STRING= @@ -39,6 +45,12 @@ CMAKE_ASM_FLAGS_RELEASE:STRING= // CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel. CMAKE_BUILD_TYPE:STRING=Release +//LLVM archiver +CMAKE_CXX_COMPILER_AR:FILEPATH=CMAKE_CXX_COMPILER_AR-NOTFOUND + +//Generate index for LLVM archive +CMAKE_CXX_COMPILER_RANLIB:FILEPATH=CMAKE_CXX_COMPILER_RANLIB-NOTFOUND + //Flags used by the compiler during all build types. CMAKE_CXX_FLAGS:STRING= @@ -58,6 +70,12 @@ CMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-O2 -g -DNDEBUG //Libraries linked by default with all C++ applications. CMAKE_CXX_STANDARD_LIBRARIES:STRING=-latomic -lm +//LLVM archiver +CMAKE_C_COMPILER_AR:FILEPATH=CMAKE_C_COMPILER_AR-NOTFOUND + +//Generate index for LLVM archive +CMAKE_C_COMPILER_RANLIB:FILEPATH=CMAKE_C_COMPILER_RANLIB-NOTFOUND + //Flags used by the compiler during all build types. CMAKE_C_FLAGS:STRING= @@ -93,19 +111,22 @@ CMAKE_EXE_LINKER_FLAGS_RELEASE:STRING= CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Enable/Disable output of compile commands during generation. -CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=OFF +CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON + +//No help, variable specified on the command line. +CMAKE_FIND_ROOT_PATH:UNINITIALIZED=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/prefab/x86/prefab //Install path prefix, prepended onto install directories. CMAKE_INSTALL_PREFIX:PATH=/usr/local //No help, variable specified on the command line. -CMAKE_LIBRARY_OUTPUT_DIRECTORY:UNINITIALIZED=/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj/x86 +CMAKE_LIBRARY_OUTPUT_DIRECTORY:UNINITIALIZED=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/release/obj/x86 //Path to a program. -CMAKE_LINKER:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ld +CMAKE_LINKER:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android-ld //No help, variable specified on the command line. -CMAKE_MAKE_PROGRAM:UNINITIALIZED=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja +CMAKE_MAKE_PROGRAM:UNINITIALIZED=/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja //Flags used by the linker during the creation of modules. CMAKE_MODULE_LINKER_FLAGS:STRING= @@ -123,19 +144,19 @@ CMAKE_MODULE_LINKER_FLAGS_RELEASE:STRING= CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Path to a program. -CMAKE_NM:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-nm +CMAKE_NM:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android-nm //Path to a program. -CMAKE_OBJCOPY:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-objcopy +CMAKE_OBJCOPY:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android-objcopy //Path to a program. -CMAKE_OBJDUMP:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-objdump +CMAKE_OBJDUMP:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android-objdump //Value Computed by CMake CMAKE_PROJECT_NAME:STATIC=Project //Ranlib -CMAKE_RANLIB:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ranlib +CMAKE_RANLIB:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android-ranlib //Flags used by the linker during the creation of dll's. CMAKE_SHARED_LINKER_FLAGS:STRING= @@ -175,10 +196,16 @@ CMAKE_STATIC_LINKER_FLAGS_RELEASE:STRING= CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO:STRING= //Path to a program. -CMAKE_STRIP:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-strip +CMAKE_STRIP:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/i686-linux-android-strip + +//No help, variable specified on the command line. +CMAKE_SYSTEM_NAME:UNINITIALIZED=Android + +//No help, variable specified on the command line. +CMAKE_SYSTEM_VERSION:UNINITIALIZED=22 //The CMake toolchain file -CMAKE_TOOLCHAIN_FILE:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake +CMAKE_TOOLCHAIN_FILE:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake //If this value is on, makefiles will be generated without the // .SILENT directive, and all commands will be echoed to the console @@ -187,16 +214,16 @@ CMAKE_TOOLCHAIN_FILE:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/buil CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE //Value Computed by CMake -Project_BINARY_DIR:STATIC=/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86 +Project_BINARY_DIR:STATIC=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86 //Value Computed by CMake -Project_SOURCE_DIR:STATIC=/home/smartdrone/Working_Private/rosettadrone_work/app +Project_SOURCE_DIR:STATIC=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app //Dependencies for the target -djivideojni_LIB_DEPENDS:STATIC=general;ffmpegjni;general;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/22/liblog.so; +djivideojni_LIB_DEPENDS:STATIC=general;ffmpegjni;general;/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/i686-linux-android/22/liblog.so; //Path to a library. -log-lib:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/22/liblog.so +log-lib:FILEPATH=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/i686-linux-android/22/liblog.so ######################## @@ -206,19 +233,23 @@ log-lib:FILEPATH=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/p //ADVANCED property for variable: CMAKE_AR CMAKE_AR-ADVANCED:INTERNAL=1 //This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86 +CMAKE_CACHEFILE_DIR:INTERNAL=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86 //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3 //Minor version of cmake used to create the current loaded cache -CMAKE_CACHE_MINOR_VERSION:INTERNAL=6 +CMAKE_CACHE_MINOR_VERSION:INTERNAL=10 //Patch version of cmake used to create the current loaded cache -CMAKE_CACHE_PATCH_VERSION:INTERNAL=0 +CMAKE_CACHE_PATCH_VERSION:INTERNAL=2 //Path to CMake executable. -CMAKE_COMMAND:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake +CMAKE_COMMAND:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake //Path to cpack program executable. -CMAKE_CPACK_COMMAND:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cpack +CMAKE_CPACK_COMMAND:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cpack //Path to ctest program executable. -CMAKE_CTEST_COMMAND:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ctest +CMAKE_CTEST_COMMAND:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/ctest +//ADVANCED property for variable: CMAKE_CXX_COMPILER_AR +CMAKE_CXX_COMPILER_AR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_CXX_COMPILER_RANLIB +CMAKE_CXX_COMPILER_RANLIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_FLAGS_DEBUG @@ -231,6 +262,10 @@ CMAKE_CXX_FLAGS_RELEASE-ADVANCED:INTERNAL=1 CMAKE_CXX_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_CXX_STANDARD_LIBRARIES CMAKE_CXX_STANDARD_LIBRARIES-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_COMPILER_AR +CMAKE_C_COMPILER_AR-ADVANCED:INTERNAL=1 +//ADVANCED property for variable: CMAKE_C_COMPILER_RANLIB +CMAKE_C_COMPILER_RANLIB-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_C_FLAGS CMAKE_C_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_C_FLAGS_DEBUG @@ -256,7 +291,7 @@ CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_EXPORT_COMPILE_COMMANDS CMAKE_EXPORT_COMPILE_COMMANDS-ADVANCED:INTERNAL=1 //Name of external makefile project generator. -CMAKE_EXTRA_GENERATOR:INTERNAL=Android Gradle +CMAKE_EXTRA_GENERATOR:INTERNAL= //Name of generator. CMAKE_GENERATOR:INTERNAL=Ninja //Name of generator platform. @@ -265,9 +300,9 @@ CMAKE_GENERATOR_PLATFORM:INTERNAL= CMAKE_GENERATOR_TOOLSET:INTERNAL= //Source directory with the top level CMakeLists.txt file for this // project -CMAKE_HOME_DIRECTORY:INTERNAL=/home/smartdrone/Working_Private/rosettadrone_work/app +CMAKE_HOME_DIRECTORY:INTERNAL=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app //Install .so files without execute permission. -CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1 +CMAKE_INSTALL_SO_NO_EXE:INTERNAL=0 //ADVANCED property for variable: CMAKE_LINKER CMAKE_LINKER-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_MODULE_LINKER_FLAGS @@ -288,10 +323,12 @@ CMAKE_NUMBER_OF_MAKEFILES:INTERNAL=1 CMAKE_OBJCOPY-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_OBJDUMP CMAKE_OBJDUMP-ADVANCED:INTERNAL=1 +//Platform information initialized +CMAKE_PLATFORM_INFO_INITIALIZED:INTERNAL=1 //ADVANCED property for variable: CMAKE_RANLIB CMAKE_RANLIB-ADVANCED:INTERNAL=1 //Path to CMake installation. -CMAKE_ROOT:INTERNAL=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6 +CMAKE_ROOT:INTERNAL=/Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS CMAKE_SHARED_LINKER_FLAGS-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_SHARED_LINKER_FLAGS_DEBUG @@ -319,7 +356,7 @@ CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_STRIP CMAKE_STRIP-ADVANCED:INTERNAL=1 //uname command -CMAKE_UNAME:INTERNAL=/bin/uname +CMAKE_UNAME:INTERNAL=/usr/bin/uname //ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1 diff --git a/app/.cxx/cmake/release/x86/CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake b/app/.cxx/cmake/release/x86/CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake deleted file mode 100644 index f1110f4..0000000 --- a/app/.cxx/cmake/release/x86/CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake +++ /dev/null @@ -1,67 +0,0 @@ -set(CMAKE_C_COMPILER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang") -set(CMAKE_C_COMPILER_ARG1 "") -set(CMAKE_C_COMPILER_ID "Clang") -set(CMAKE_C_COMPILER_VERSION "9.0") -set(CMAKE_C_COMPILER_WRAPPER "") -set(CMAKE_C_STANDARD_COMPUTED_DEFAULT "11") -set(CMAKE_C_COMPILE_FEATURES "c_function_prototypes;c_restrict;c_variadic_macros;c_static_assert") -set(CMAKE_C90_COMPILE_FEATURES "c_function_prototypes") -set(CMAKE_C99_COMPILE_FEATURES "c_restrict;c_variadic_macros") -set(CMAKE_C11_COMPILE_FEATURES "c_static_assert") - -set(CMAKE_C_PLATFORM_ID "") -set(CMAKE_C_SIMULATE_ID "") -set(CMAKE_C_SIMULATE_VERSION "") - -set(CMAKE_AR "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ar") -set(CMAKE_RANLIB "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ranlib") -set(CMAKE_LINKER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ld") -set(CMAKE_COMPILER_IS_GNUCC ) -set(CMAKE_C_COMPILER_LOADED 1) -set(CMAKE_C_COMPILER_WORKS TRUE) -set(CMAKE_C_ABI_COMPILED TRUE) -set(CMAKE_COMPILER_IS_MINGW ) -set(CMAKE_COMPILER_IS_CYGWIN ) -if(CMAKE_COMPILER_IS_CYGWIN) - set(CYGWIN 1) - set(UNIX 1) -endif() - -set(CMAKE_C_COMPILER_ENV_VAR "CC") - -if(CMAKE_COMPILER_IS_MINGW) - set(MINGW 1) -endif() -set(CMAKE_C_COMPILER_ID_RUN 1) -set(CMAKE_C_SOURCE_FILE_EXTENSIONS c;m) -set(CMAKE_C_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC) -set(CMAKE_C_LINKER_PREFERENCE 10) - -# Save compiler ABI information. -set(CMAKE_C_SIZEOF_DATA_PTR "4") -set(CMAKE_C_COMPILER_ABI "ELF") -set(CMAKE_C_LIBRARY_ARCHITECTURE "") - -if(CMAKE_C_SIZEOF_DATA_PTR) - set(CMAKE_SIZEOF_VOID_P "${CMAKE_C_SIZEOF_DATA_PTR}") -endif() - -if(CMAKE_C_COMPILER_ABI) - set(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_C_COMPILER_ABI}") -endif() - -if(CMAKE_C_LIBRARY_ARCHITECTURE) - set(CMAKE_LIBRARY_ARCHITECTURE "") -endif() - -set(CMAKE_C_CL_SHOWINCLUDES_PREFIX "") -if(CMAKE_C_CL_SHOWINCLUDES_PREFIX) - set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_C_CL_SHOWINCLUDES_PREFIX}") -endif() - - - - -set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "dl;c;dl") -set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/9.0.8/lib/linux/i386;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib/gcc/i686-linux-android/4.9.x;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/22;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/i686-linux-android/lib;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib") -set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "") diff --git a/app/.cxx/cmake/release/x86/CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake b/app/.cxx/cmake/release/x86/CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake deleted file mode 100644 index 042d594..0000000 --- a/app/.cxx/cmake/release/x86/CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake +++ /dev/null @@ -1,68 +0,0 @@ -set(CMAKE_CXX_COMPILER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++") -set(CMAKE_CXX_COMPILER_ARG1 "") -set(CMAKE_CXX_COMPILER_ID "Clang") -set(CMAKE_CXX_COMPILER_VERSION "9.0") -set(CMAKE_CXX_COMPILER_WRAPPER "") -set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT "14") -set(CMAKE_CXX_COMPILE_FEATURES "cxx_template_template_parameters;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates") -set(CMAKE_CXX98_COMPILE_FEATURES "cxx_template_template_parameters") -set(CMAKE_CXX11_COMPILE_FEATURES "cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates") -set(CMAKE_CXX14_COMPILE_FEATURES "cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates") - -set(CMAKE_CXX_PLATFORM_ID "") -set(CMAKE_CXX_SIMULATE_ID "") -set(CMAKE_CXX_SIMULATE_VERSION "") - -set(CMAKE_AR "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ar") -set(CMAKE_RANLIB "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ranlib") -set(CMAKE_LINKER "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android-ld") -set(CMAKE_COMPILER_IS_GNUCXX ) -set(CMAKE_CXX_COMPILER_LOADED 1) -set(CMAKE_CXX_COMPILER_WORKS TRUE) -set(CMAKE_CXX_ABI_COMPILED TRUE) -set(CMAKE_COMPILER_IS_MINGW ) -set(CMAKE_COMPILER_IS_CYGWIN ) -if(CMAKE_COMPILER_IS_CYGWIN) - set(CYGWIN 1) - set(UNIX 1) -endif() - -set(CMAKE_CXX_COMPILER_ENV_VAR "CXX") - -if(CMAKE_COMPILER_IS_MINGW) - set(MINGW 1) -endif() -set(CMAKE_CXX_COMPILER_ID_RUN 1) -set(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC) -set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;mm;CPP) -set(CMAKE_CXX_LINKER_PREFERENCE 30) -set(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1) - -# Save compiler ABI information. -set(CMAKE_CXX_SIZEOF_DATA_PTR "4") -set(CMAKE_CXX_COMPILER_ABI "ELF") -set(CMAKE_CXX_LIBRARY_ARCHITECTURE "") - -if(CMAKE_CXX_SIZEOF_DATA_PTR) - set(CMAKE_SIZEOF_VOID_P "${CMAKE_CXX_SIZEOF_DATA_PTR}") -endif() - -if(CMAKE_CXX_COMPILER_ABI) - set(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_CXX_COMPILER_ABI}") -endif() - -if(CMAKE_CXX_LIBRARY_ARCHITECTURE) - set(CMAKE_LIBRARY_ARCHITECTURE "") -endif() - -set(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX "") -if(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX) - set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_CXX_CL_SHOWINCLUDES_PREFIX}") -endif() - - - - -set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "c++;m;dl;c;dl") -set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/9.0.8/lib/linux/i386;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/lib/gcc/i686-linux-android/4.9.x;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/22;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/i686-linux-android/lib;/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib") -set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "") diff --git a/app/.cxx/cmake/release/x86/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin b/app/.cxx/cmake/release/x86/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin deleted file mode 100755 index a114e63..0000000 Binary files a/app/.cxx/cmake/release/x86/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_C.bin and /dev/null differ diff --git a/app/.cxx/cmake/release/x86/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin b/app/.cxx/cmake/release/x86/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin deleted file mode 100755 index 067263c..0000000 Binary files a/app/.cxx/cmake/release/x86/CMakeFiles/3.6.0-rc2/CMakeDetermineCompilerABI_CXX.bin and /dev/null differ diff --git a/app/.cxx/cmake/release/x86/CMakeFiles/3.6.0-rc2/CMakeSystem.cmake b/app/.cxx/cmake/release/x86/CMakeFiles/3.6.0-rc2/CMakeSystem.cmake deleted file mode 100644 index ac531bf..0000000 --- a/app/.cxx/cmake/release/x86/CMakeFiles/3.6.0-rc2/CMakeSystem.cmake +++ /dev/null @@ -1,15 +0,0 @@ -set(CMAKE_HOST_SYSTEM "Linux-4.15.0-112-generic") -set(CMAKE_HOST_SYSTEM_NAME "Linux") -set(CMAKE_HOST_SYSTEM_VERSION "4.15.0-112-generic") -set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64") - -include("/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake") - -set(CMAKE_SYSTEM "Android-1") -set(CMAKE_SYSTEM_NAME "Android") -set(CMAKE_SYSTEM_VERSION "1") -set(CMAKE_SYSTEM_PROCESSOR "i686") - -set(CMAKE_CROSSCOMPILING "TRUE") - -set(CMAKE_SYSTEM_LOADED 1) diff --git a/app/.cxx/cmake/release/x86/CMakeFiles/TargetDirectories.txt b/app/.cxx/cmake/release/x86/CMakeFiles/TargetDirectories.txt index 6941c19..eef68b4 100644 --- a/app/.cxx/cmake/release/x86/CMakeFiles/TargetDirectories.txt +++ b/app/.cxx/cmake/release/x86/CMakeFiles/TargetDirectories.txt @@ -1,3 +1,3 @@ -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86/CMakeFiles/rebuild_cache.dir -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86/CMakeFiles/edit_cache.dir -/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86/CMakeFiles/djivideojni.dir +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86/CMakeFiles/rebuild_cache.dir +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86/CMakeFiles/edit_cache.dir +/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86/CMakeFiles/djivideojni.dir diff --git a/app/.cxx/cmake/release/x86/CMakeFiles/feature_tests.bin b/app/.cxx/cmake/release/x86/CMakeFiles/feature_tests.bin index dc557f5..66a98d0 100755 Binary files a/app/.cxx/cmake/release/x86/CMakeFiles/feature_tests.bin and b/app/.cxx/cmake/release/x86/CMakeFiles/feature_tests.bin differ diff --git a/app/.cxx/cmake/release/x86/CMakeFiles/feature_tests.cxx b/app/.cxx/cmake/release/x86/CMakeFiles/feature_tests.cxx index a9b4791..703b335 100644 --- a/app/.cxx/cmake/release/x86/CMakeFiles/feature_tests.cxx +++ b/app/.cxx/cmake/release/x86/CMakeFiles/feature_tests.cxx @@ -1,35 +1,35 @@ const char features[] = {"\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_aggregate_nsdmi) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_aggregate_nsdmi) "1" #else "0" #endif "cxx_aggregate_default_initializers\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_alias_templates) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_alias_templates) "1" #else "0" #endif "cxx_alias_templates\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_alignas) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_alignas) "1" #else "0" #endif "cxx_alignas\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_alignas) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_alignas) "1" #else "0" #endif "cxx_alignof\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_attributes) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_attributes) "1" #else "0" @@ -43,35 +43,35 @@ #endif "cxx_attribute_deprecated\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_auto_type) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_auto_type) "1" #else "0" #endif "cxx_auto_type\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_binary_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_binary_literals) "1" #else "0" #endif "cxx_binary_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_constexpr) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_constexpr) "1" #else "0" #endif "cxx_constexpr\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_contextual_conversions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_contextual_conversions) "1" #else "0" #endif "cxx_contextual_conversions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_decltype) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_decltype) "1" #else "0" @@ -85,42 +85,42 @@ #endif "cxx_decltype_auto\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_decltype_incomplete_return_types) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_decltype_incomplete_return_types) "1" #else "0" #endif "cxx_decltype_incomplete_return_types\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_default_function_template_args) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_default_function_template_args) "1" #else "0" #endif "cxx_default_function_template_args\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_defaulted_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_defaulted_functions) "1" #else "0" #endif "cxx_defaulted_functions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_defaulted_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_defaulted_functions) "1" #else "0" #endif "cxx_defaulted_move_initializers\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_delegating_constructors) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_delegating_constructors) "1" #else "0" #endif "cxx_delegating_constructors\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_deleted_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_deleted_functions) "1" #else "0" @@ -134,49 +134,49 @@ #endif "cxx_digit_separators\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_enum_forward_declarations\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_explicit_conversions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_explicit_conversions) "1" #else "0" #endif "cxx_explicit_conversions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_extended_friend_declarations\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_extern_templates\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_override_control) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_override_control) "1" #else "0" #endif "cxx_final\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_func_identifier\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_generalized_initializers) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_generalized_initializers) "1" #else "0" @@ -190,210 +190,210 @@ #endif "cxx_generic_lambdas\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_inheriting_constructors) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_inheriting_constructors) "1" #else "0" #endif "cxx_inheriting_constructors\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_inline_namespaces\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_lambdas) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_lambdas) "1" #else "0" #endif "cxx_lambdas\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_init_captures) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_init_captures) "1" #else "0" #endif "cxx_lambda_init_captures\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_local_type_template_args) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_local_type_template_args) "1" #else "0" #endif "cxx_local_type_template_args\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_long_long_type\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_noexcept) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_noexcept) "1" #else "0" #endif "cxx_noexcept\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_nonstatic_member_init) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_nonstatic_member_init) "1" #else "0" #endif "cxx_nonstatic_member_init\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_nullptr) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_nullptr) "1" #else "0" #endif "cxx_nullptr\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_override_control) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_override_control) "1" #else "0" #endif "cxx_override\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_range_for) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_range_for) "1" #else "0" #endif "cxx_range_for\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_raw_string_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_raw_string_literals) "1" #else "0" #endif "cxx_raw_string_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_reference_qualified_functions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_reference_qualified_functions) "1" #else "0" #endif "cxx_reference_qualified_functions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_relaxed_constexpr) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_relaxed_constexpr) "1" #else "0" #endif "cxx_relaxed_constexpr\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_return_type_deduction) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_return_type_deduction) "1" #else "0" #endif "cxx_return_type_deduction\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_right_angle_brackets\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_rvalue_references) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_rvalue_references) "1" #else "0" #endif "cxx_rvalue_references\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_sizeof_member\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_static_assert) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_static_assert) "1" #else "0" #endif "cxx_static_assert\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_strong_enums) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_strong_enums) "1" #else "0" #endif "cxx_strong_enums\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 199711L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 199711L "1" #else "0" #endif "cxx_template_template_parameters\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_thread_local) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_thread_local) "1" #else "0" #endif "cxx_thread_local\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_trailing_return) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_trailing_return) "1" #else "0" #endif "cxx_trailing_return_types\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_unicode_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_unicode_literals) "1" #else "0" #endif "cxx_unicode_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_generalized_initializers) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_generalized_initializers) "1" #else "0" #endif "cxx_uniform_initialization\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_unrestricted_unions) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_unrestricted_unions) "1" #else "0" #endif "cxx_unrestricted_unions\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_user_literals) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_user_literals) "1" #else "0" #endif "cxx_user_literals\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_variable_templates) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_variable_templates) "1" #else "0" #endif "cxx_variable_templates\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __cplusplus >= 201103L +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __cplusplus >= 201103L "1" #else "0" #endif "cxx_variadic_macros\n" "CXX_FEATURE:" -#if ((__clang_major__ * 100) + __clang_minor__) >= 304 && __has_feature(cxx_variadic_templates) +#if ((__clang_major__ * 100) + __clang_minor__) >= 301 && __has_feature(cxx_variadic_templates) "1" #else "0" diff --git a/app/.cxx/cmake/release/x86/android_gradle_build.json b/app/.cxx/cmake/release/x86/android_gradle_build.json index d9e5bc6..67ba290 100644 --- a/app/.cxx/cmake/release/x86/android_gradle_build.json +++ b/app/.cxx/cmake/release/x86/android_gradle_build.json @@ -1,65 +1,45 @@ - { - "buildFiles" : - [ - "/home/smartdrone/Working_Private/rosettadrone_work/app/CMakeLists.txt" - ], - "cFileExtensions" : [ "c" ], - "cleanCommands" : - [ - "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86 --target clean" - ], - "libraries" : - { - "c++_shared-Release-x86" : - { - "abi" : "x86", - "artifactName" : "c++_shared", - "buildType" : "release", - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/x86/libc++_shared.so.27", - "toolchain" : "6038786665986016389" - }, - "djivideojni-Release-x86" : - { - "abi" : "x86", - "artifactName" : "djivideojni", - "buildCommand" : "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86 --target djivideojni", - "buildType" : "release", - "files" : - [ - - { - "flags" : " --target=i686-none-linux-android22 --gcc-toolchain=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64 --sysroot=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot -Ddjivideojni_EXPORTS -I../../../../src/main/cpp -I../../../../src/main/cpp/include -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/gstreamer-1.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/glib-2.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/lib/glib-2.0/include -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -mstackrealign -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O2 -DNDEBUG -fPIC -c ", - "src" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/dji_video_jni.c", - "workingDirectory" : "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86" - } - ], - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj/x86/libdjivideojni.so", - "toolchain" : "6038786665986016389" - }, - "ffmpegjni-Release-x86" : - { - "abi" : "x86", - "artifactName" : "ffmpegjni", - "buildType" : "release", - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/x86/libffmpeg.so", - "toolchain" : "6038786665986016389" - }, - "gstreamer_android-Release-x86" : - { - "abi" : "x86", - "artifactName" : "gstreamer_android", - "buildType" : "release", - "output" : "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/x86/libgstreamer_android.so", - "toolchain" : "6038786665986016389" - } - }, - "toolchains" : - { - "6038786665986016389" : - { - "cCompilerExecutable" : "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang", - "cppCompilerExecutable" : "/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++" - } - } -} + "stringTable": { + "0": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86", + "1": "--target=i686-none-linux-android22 --gcc-toolchain=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64 --sysroot=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -Ddjivideojni_EXPORTS -I../../../../src/main/cpp -I../../../../src/main/cpp/include -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/gstreamer-1.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/glib-2.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/lib/glib-2.0/include -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -mstackrealign -fno-addrsig -Wa,--noexecstack -Wformat -Werror=format-security -O2 -DNDEBUG -fPIC" + }, + "buildFiles": [ + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake" + ], + "cleanCommands": [ + "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86\" clean" + ], + "buildTargetsCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86\" {LIST_OF_TARGETS_TO_BUILD}", + "libraries": { + "djivideojni-Release-x86": { + "buildCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86\" djivideojni", + "buildType": "release", + "toolchain": "3669181217", + "abi": "x86", + "artifactName": "djivideojni", + "files": [ + { + "src": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/src/main/cpp/dji_video_jni.c", + "flagsOrdinal": 1, + "workingDirectoryOrdinal": 0 + } + ], + "headers": [], + "output": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/release/obj/x86/libdjivideojni.so", + "runtimeFiles": [ + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/src/main/cpp/lib/x86/libffmpeg.so" + ] + } + }, + "toolchains": { + "3669181217": { + "cCompilerExecutable": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang" + } + }, + "cFileExtensions": [ + "c" + ], + "cppFileExtensions": [] +} \ No newline at end of file diff --git a/app/.cxx/cmake/release/x86/android_gradle_build_mini.json b/app/.cxx/cmake/release/x86/android_gradle_build_mini.json index 93ee81f..a881611 100644 --- a/app/.cxx/cmake/release/x86/android_gradle_build_mini.json +++ b/app/.cxx/cmake/release/x86/android_gradle_build_mini.json @@ -1,31 +1,22 @@ { "buildFiles": [ - "/home/smartdrone/Working_Private/rosettadrone_work/app/CMakeLists.txt" + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake" ], "cleanCommands": [ - "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86 --target clean" + "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86\" clean" ], + "buildTargetsCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86\" {LIST_OF_TARGETS_TO_BUILD}", "libraries": { "djivideojni-Release-x86": { "artifactName": "djivideojni", - "buildCommand": "/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake --build /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86 --target djivideojni", + "buildCommand": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -C \"/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86\" djivideojni", "abi": "x86", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj/x86/libdjivideojni.so" - }, - "gstreamer_android-Release-x86": { - "artifactName": "gstreamer_android", - "abi": "x86", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/x86/libgstreamer_android.so" - }, - "c++_shared-Release-x86": { - "artifactName": "c++_shared", - "abi": "x86", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/x86/libc++_shared.so.27" - }, - "ffmpegjni-Release-x86": { - "artifactName": "ffmpegjni", - "abi": "x86", - "output": "/home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/lib/x86/libffmpeg.so" + "output": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/release/obj/x86/libdjivideojni.so", + "runtimeFiles": [ + "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/src/main/cpp/lib/x86/libffmpeg.so" + ] } } } \ No newline at end of file diff --git a/app/.cxx/cmake/release/x86/android_gradle_generate_cmake_ninja_json_x86.command.txt b/app/.cxx/cmake/release/x86/android_gradle_generate_cmake_ninja_json_x86.command.txt deleted file mode 100644 index aca2d53..0000000 --- a/app/.cxx/cmake/release/x86/android_gradle_generate_cmake_ninja_json_x86.command.txt +++ /dev/null @@ -1,14 +0,0 @@ -Executable : /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -arguments : --H/home/smartdrone/Working_Private/rosettadrone_work/app --B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86 --DANDROID_ABI=x86 --DANDROID_PLATFORM=android-22 --DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj/x86 --DCMAKE_BUILD_TYPE=Release --DANDROID_NDK=/home/smartdrone/Android/Sdk/ndk/21.3.6528147 --DCMAKE_TOOLCHAIN_FILE=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake --DCMAKE_MAKE_PROGRAM=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja --GAndroid Gradle - Ninja -jvmArgs : - diff --git a/app/.cxx/cmake/release/x86/android_gradle_generate_cmake_ninja_json_x86.stderr.txt b/app/.cxx/cmake/release/x86/android_gradle_generate_cmake_ninja_json_x86.stderr.txt deleted file mode 100644 index e69de29..0000000 diff --git a/app/.cxx/cmake/release/x86/android_gradle_generate_cmake_ninja_json_x86.stdout.txt b/app/.cxx/cmake/release/x86/android_gradle_generate_cmake_ninja_json_x86.stdout.txt deleted file mode 100644 index e33d2c8..0000000 --- a/app/.cxx/cmake/release/x86/android_gradle_generate_cmake_ninja_json_x86.stdout.txt +++ /dev/null @@ -1,15 +0,0 @@ --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -- works --- Detecting C compiler ABI info --- Detecting C compiler ABI info - done --- Detecting C compile features --- Detecting C compile features - done --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -- works --- Detecting CXX compiler ABI info --- Detecting CXX compiler ABI info - done --- Detecting CXX compile features --- Detecting CXX compile features - done --- Configuring done --- Generating done --- Build files have been written to: /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86 diff --git a/app/.cxx/cmake/release/x86/build.ninja b/app/.cxx/cmake/release/x86/build.ninja index ad9a822..12393e1 100644 --- a/app/.cxx/cmake/release/x86/build.ninja +++ b/app/.cxx/cmake/release/x86/build.ninja @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Ninja" Generator, CMake Version 3.6 +# Generated by "Ninja" Generator, CMake Version 3.10 # This file contains all the build statements describing the # compilation DAG. @@ -34,7 +34,7 @@ include rules.ninja # Utility command for rebuild_cache build CMakeFiles/rebuild_cache.util: CUSTOM_COMMAND - COMMAND = cd /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86 && /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -H/home/smartdrone/Working_Private/rosettadrone_work/app -B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86 + COMMAND = cd /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86 && /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake -H/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app -B/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86 DESC = Running CMake to regenerate build system... pool = console restat = 1 @@ -44,19 +44,23 @@ build rebuild_cache: phony CMakeFiles/rebuild_cache.util # Utility command for edit_cache build CMakeFiles/edit_cache.util: CUSTOM_COMMAND - COMMAND = cd /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86 && /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. + COMMAND = cd /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86 && /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. DESC = No interactive CMake dialog available... restat = 1 build edit_cache: phony CMakeFiles/edit_cache.util # ============================================================================= # Object build statements for SHARED_LIBRARY target djivideojni -build CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o: C_COMPILER__djivideojni ../../../../src/main/cpp/dji_video_jni.c + +############################################# +# Order-only phony target for djivideojni + +build cmake_object_order_depends_target_djivideojni: phony +build CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o: C_COMPILER__djivideojni ../../../../src/main/cpp/dji_video_jni.c || cmake_object_order_depends_target_djivideojni DEFINES = -Ddjivideojni_EXPORTS DEP_FILE = CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o.d - FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -mstackrealign -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O2 -DNDEBUG -fPIC + FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -mstackrealign -fno-addrsig -Wa,--noexecstack -Wformat -Werror=format-security -O2 -DNDEBUG -fPIC INCLUDES = -I../../../../src/main/cpp -I../../../../src/main/cpp/include -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/gstreamer-1.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/include/glib-2.0 -I../../../../src/main/cpp/gstreamer-1.0/armv7/lib/glib-2.0/include - IN_ABS = /home/smartdrone/Working_Private/rosettadrone_work/app/src/main/cpp/dji_video_jni.c OBJECT_DIR = CMakeFiles/djivideojni.dir OBJECT_FILE_DIR = CMakeFiles/djivideojni.dir/src/main/cpp @@ -67,10 +71,10 @@ build CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o: C_COMPILER__dji ############################################# # Link the shared library ../../../../build/intermediates/cmake/release/obj/x86/libdjivideojni.so -build ../../../../build/intermediates/cmake/release/obj/x86/libdjivideojni.so: C_SHARED_LIBRARY_LINKER__djivideojni CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o | ../../../../src/main/cpp/lib/x86/libffmpeg.so /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/22/liblog.so - LANGUAGE_COMPILE_FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -mstackrealign -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -O2 -DNDEBUG - LINK_FLAGS = -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libgcc_real.a -Wl,--exclude-libs,libatomic.a -static-libstdc++ -Wl,--build-id -Wl,--fatal-warnings -Wl,--no-undefined -Qunused-arguments - LINK_LIBRARIES = ../../../../src/main/cpp/lib/x86/libffmpeg.so /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/22/liblog.so -latomic -lm +build ../../../../build/intermediates/cmake/release/obj/x86/libdjivideojni.so: C_SHARED_LIBRARY_LINKER__djivideojni CMakeFiles/djivideojni.dir/src/main/cpp/dji_video_jni.c.o | ../../../../src/main/cpp/lib/x86/libffmpeg.so /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/i686-linux-android/22/liblog.so + LANGUAGE_COMPILE_FLAGS = -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -mstackrealign -fno-addrsig -Wa,--noexecstack -Wformat -Werror=format-security -O2 -DNDEBUG + LINK_FLAGS = -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -static-libstdc++ -Wl,--build-id -Wl,--warn-shared-textrel -Wl,--fatal-warnings -Wl,--no-undefined -Qunused-arguments -Wl,-z,noexecstack + LINK_LIBRARIES = ../../../../src/main/cpp/lib/x86/libffmpeg.so -llog -latomic -lm OBJECT_DIR = CMakeFiles/djivideojni.dir POST_BUILD = : PRE_LINK = : @@ -104,13 +108,13 @@ default all ############################################# # Re-run CMake if any of its inputs changed. -build build.ninja: RERUN_CMAKE | ../../../../CMakeLists.txt /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompilerABI.c /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompilerABI.cpp /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCommonLanguageInclude.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompileFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompilerABI.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeFindBinUtils.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeGenericSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeLanguageInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeParseImplicitLinkInfo.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystem.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInitialize.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCompilerCommon.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/GNU.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Internal/FeatureTesting.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Android.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Linux.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/UnixPaths.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/platforms.cmake CMakeCache.txt CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx +build build.ninja: RERUN_CMAKE | ../../../../CMakeLists.txt /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompilerABI.c /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompilerABI.cpp /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCommonLanguageInclude.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompileFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompilerABI.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeFindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeGenericSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeLanguageInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeParseImplicitLinkInfo.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystem.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInitialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCompilerCommon.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/CMakeCommonCompilerMacros.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-FindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/GNU.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Internal/FeatureTesting.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Initialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android/Determine-Compiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Linux.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/UnixPaths.cmake CMakeCache.txt CMakeFiles/3.10.2/CMakeCCompiler.cmake CMakeFiles/3.10.2/CMakeCXXCompiler.cmake CMakeFiles/3.10.2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx pool = console ############################################# # A missing CMake input file is not an error. -build ../../../../CMakeLists.txt /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCCompilerABI.c /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompiler.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXCompilerABI.cpp /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCXXInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeCommonLanguageInclude.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompileFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineCompilerABI.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeDetermineSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeFindBinUtils.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeGenericSystem.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeLanguageInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeParseImplicitLinkInfo.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystem.cmake.in /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInformation.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeSystemSpecificInitialize.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCXXCompiler.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/CMakeTestCompilerCommon.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-C.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-FeatureTests.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang-CXX.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/Clang.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Compiler/GNU.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Internal/FeatureTesting.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Android.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/Linux.cmake /home/smartdrone/Android/Sdk/cmake/3.6.4111459/share/cmake-3.6/Modules/Platform/UnixPaths.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake /home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/platforms.cmake CMakeCache.txt CMakeFiles/3.6.0-rc2/CMakeCCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeCXXCompiler.cmake CMakeFiles/3.6.0-rc2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx: phony +build ../../../../CMakeLists.txt /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake /Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/platforms.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCCompilerABI.c /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompiler.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXCompilerABI.cpp /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCXXInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeCommonLanguageInclude.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompileFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineCompilerABI.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeDetermineSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeFindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeGenericSystem.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeLanguageInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeParseImplicitLinkInfo.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystem.cmake.in /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInformation.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeSystemSpecificInitialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCXXCompiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/CMakeTestCompilerCommon.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/CMakeCommonCompilerMacros.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-FeatureTests.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX-TestableFeatures.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang-FindBinUtils.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Compiler/GNU.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Internal/FeatureTesting.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Clang.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-C.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine-CXX.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Determine.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android-Initialize.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Android/Determine-Compiler.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/Linux.cmake /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/share/cmake-3.10/Modules/Platform/UnixPaths.cmake CMakeCache.txt CMakeFiles/3.10.2/CMakeCCompiler.cmake CMakeFiles/3.10.2/CMakeCXXCompiler.cmake CMakeFiles/3.10.2/CMakeSystem.cmake CMakeFiles/feature_tests.c CMakeFiles/feature_tests.cxx: phony ############################################# # Clean all the built files. diff --git a/app/.cxx/cmake/release/x86/build_command.txt b/app/.cxx/cmake/release/x86/build_command.txt index aca2d53..d6a5e8c 100644 --- a/app/.cxx/cmake/release/x86/build_command.txt +++ b/app/.cxx/cmake/release/x86/build_command.txt @@ -1,14 +1,21 @@ -Executable : /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake + Executable : /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake arguments : --H/home/smartdrone/Working_Private/rosettadrone_work/app --B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86 --DANDROID_ABI=x86 --DANDROID_PLATFORM=android-22 --DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj/x86 +-H/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app +-DCMAKE_FIND_ROOT_PATH=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/prefab/x86/prefab -DCMAKE_BUILD_TYPE=Release --DANDROID_NDK=/home/smartdrone/Android/Sdk/ndk/21.3.6528147 --DCMAKE_TOOLCHAIN_FILE=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/build/cmake/android.toolchain.cmake --DCMAKE_MAKE_PROGRAM=/home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja --GAndroid Gradle - Ninja +-DCMAKE_TOOLCHAIN_FILE=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake +-DANDROID_ABI=x86 +-DANDROID_NDK=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 +-DANDROID_PLATFORM=android-22 +-DCMAKE_ANDROID_ARCH_ABI=x86 +-DCMAKE_ANDROID_NDK=/Users/teni/Library/Android/sdk/ndk/20.1.5948944 +-DCMAKE_EXPORT_COMPILE_COMMANDS=ON +-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/release/obj/x86 +-DCMAKE_MAKE_PROGRAM=/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja +-DCMAKE_SYSTEM_NAME=Android +-DCMAKE_SYSTEM_VERSION=22 +-B/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86 +-GNinja jvmArgs : +Build command args: diff --git a/app/.cxx/cmake/release/x86/build_model.json b/app/.cxx/cmake/release/x86/build_model.json index 4901699..4d90cdc 100644 --- a/app/.cxx/cmake/release/x86/build_model.json +++ b/app/.cxx/cmake/release/x86/build_model.json @@ -1,69 +1,203 @@ { - "variant": { - "module": { - "rootBuildGradleFolder": "/home/smartdrone/Working_Private/rosettadrone_work", - "sdkFolder": "/home/smartdrone/Android/Sdk", - "isNativeCompilerSettingsCacheEnabled": false, - "isBuildOnlyTargetAbiEnabled": true, - "splitsAbiFilterSet": [], - "intermediatesFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates", - "gradleModulePathName": ":app", - "moduleRootFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app", - "makeFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/CMakeLists.txt", - "buildSystem": "CMAKE", - "compilerSettingsCacheFolder": "/home/smartdrone/Working_Private/rosettadrone_work/.cxx", - "cxxFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx", - "ndkFolder": "/home/smartdrone/Android/Sdk/ndk/21.3.6528147", - "ndkVersion": "21.3.6528147", - "ndkSupportedAbiList": [ - "ARMEABI_V7A", - "ARM64_V8A", - "X86", - "X86_64" + "abi": "X86", + "abiPlatformVersion": 22, + "buildSettings": { + "environmentVariables": [] + }, + "cmake": { + "cmakeArtifactsBaseFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86", + "cmakeServerLogFile": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86/cmake_server_log.txt", + "cmakeWrappingBaseFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cxx/release/x86", + "effectiveConfiguration": { + "name": "traditional-android-studio-cmake-environment", + "description": "Composite reified CMakeSettings configuration", + "generator": "Ninja", + "inheritEnvironments": [ + "ndk" ], + "buildRoot": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86", + "cmakeToolchain": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "cmakeExecutable": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake", + "variables": [ + { + "name": "CMAKE_FIND_ROOT_PATH", + "value": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/prefab/x86/prefab" + }, + { + "name": "CMAKE_BUILD_TYPE", + "value": "Release" + }, + { + "name": "CMAKE_TOOLCHAIN_FILE", + "value": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake" + }, + { + "name": "ANDROID_ABI", + "value": "x86" + }, + { + "name": "ANDROID_NDK", + "value": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944" + }, + { + "name": "ANDROID_PLATFORM", + "value": "android-22" + }, + { + "name": "CMAKE_ANDROID_ARCH_ABI", + "value": "x86" + }, + { + "name": "CMAKE_ANDROID_NDK", + "value": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944" + }, + { + "name": "CMAKE_EXPORT_COMPILE_COMMANDS", + "value": "ON" + }, + { + "name": "CMAKE_LIBRARY_OUTPUT_DIRECTORY", + "value": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/release/obj/x86" + }, + { + "name": "CMAKE_MAKE_PROGRAM", + "value": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja" + }, + { + "name": "CMAKE_SYSTEM_NAME", + "value": "Android" + }, + { + "name": "CMAKE_SYSTEM_VERSION", + "value": "22" + } + ] + } + }, + "cxxBuildFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86", + "info": { + "abi": "X86", + "bitness": 32, + "deprecated": false, + "default": true + }, + "originalCxxBuildFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86", + "variant": { + "buildSystemArgumentList": [], + "buildTargetSet": [], + "implicitBuildTargetSet": [], + "cFlagsList": [], + "cmakeSettingsConfiguration": "android-gradle-plugin-predetermined-name", + "cppFlagsList": [], + "isDebuggableEnabled": false, + "module": { + "buildSystem": "CMAKE", + "cmake": { + "cmakeExe": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake", + "minimumCmakeVersion": "3.10.2", + "ninjaExe": "/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja" + }, + "cmakeToolchainFile": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/build/cmake/android.toolchain.cmake", + "cxxFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx", + "gradleModulePathName": ":app", + "intermediatesFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates", + "makeFile": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "moduleBuildFile": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build.gradle", + "moduleRootFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app", "ndkDefaultAbiList": [ "ARMEABI_V7A", "ARM64_V8A", "X86", "X86_64" ], - "cmakeToolchainFile": "." + "ndkFolder": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944", + "ndkMetaAbiList": [ + { + "abi": "ARMEABI_V7A", + "bitness": 32, + "deprecated": false, + "default": true + }, + { + "abi": "ARM64_V8A", + "bitness": 64, + "deprecated": false, + "default": true + }, + { + "abi": "X86", + "bitness": 32, + "deprecated": false, + "default": true + }, + { + "abi": "X86_64", + "bitness": 64, + "deprecated": false, + "default": true + } + ], + "ndkMetaPlatforms": { + "min": 16, + "max": 29, + "aliases": { + "20": 19, + "25": 24, + "J": 16, + "J-MR1": 17, + "J-MR2": 18, + "K": 19, + "L": 21, + "L-MR1": 22, + "M": 23, + "N": 24, + "N-MR1": 24, + "O": 26, + "O-MR1": 27, + "P": 28, + "Q": 29 + } + }, + "ndkSupportedAbiList": [ + "ARMEABI_V7A", + "ARM64_V8A", + "X86", + "X86_64" + ], + "ndkDefaultStl": "LIBCXX_STATIC", + "ndkVersion": "20.1.5948944", + "project": { + "compilerSettingsCacheFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/.cxx", + "cxxFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/.cxx", + "isBuildOnlyTargetAbiEnabled": true, + "isCmakeBuildCohabitationEnabled": false, + "isNativeCompilerSettingsCacheEnabled": false, + "rootBuildGradleFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work", + "sdkFolder": "/Users/teni/Library/Android/sdk", + "isPrefabEnabled": false + }, + "splitsAbiFilterSet": [], + "stlSharedObjectMap": { + "LIBCXX_SHARED": { + "ARMEABI_V7A": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/arm-linux-androideabi/libc++_shared.so", + "ARM64_V8A": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so", + "X86": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/i686-linux-android/libc++_shared.so", + "X86_64": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot/usr/lib/x86_64-linux-android/libc++_shared.so" + }, + "LIBCXX_STATIC": {}, + "NONE": {}, + "SYSTEM": {} + } }, - "buildSystemArgumentList": [], - "cFlagList": [], - "cppFlagsList": [], + "objFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/build/intermediates/cmake/release/obj", "variantName": "release", - "soFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/lib", - "objFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj", - "jsonFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release", - "gradleBuildOutputFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release", - "isDebuggableEnabled": false, "validAbiList": [ "ARMEABI_V7A", "ARM64_V8A", "X86" ], - "buildTargetSet": [] + "prefabDirectory": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/prefab", + "prefabPackageDirectoryList": [] }, - "abi": "X86", - "abiPlatformVersion": 22, - "cxxBuildFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86", - "jsonFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86/android_gradle_build.json", - "gradleBuildOutputFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/x86", - "objFolder": "/home/smartdrone/Working_Private/rosettadrone_work/app/build/intermediates/cmake/release/obj/x86", - "buildCommandFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86/build_command.txt", - "buildOutputFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86/build_output.txt", - "modelOutputFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86/build_model.json", - "cmake": { - "cmakeListsWrapperFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/x86/CMakeLists.txt", - "toolchainWrapperFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/x86/android_gradle_build.toolchain.cmake", - "buildGenerationStateFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/x86/build_generation_state.json", - "cacheKeyFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/x86/compiler_cache_key.json", - "compilerCacheUseFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/x86/compiler_cache_use.json", - "compilerCacheWriteFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/x86/compiler_cache_write.json", - "toolchainSettingsFromCacheFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cxx/release/x86/compiler_settings_cache.cmake", - "cmakeWrappingBaseFolder": "." - }, - "jsonGenerationLoggingRecordFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86/json_generation_record.json", - "compileCommandsJsonFile": "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86/compile_commands.json" + "prefabFolder": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/prefab/x86" } \ No newline at end of file diff --git a/app/.cxx/cmake/release/x86/build_output.txt b/app/.cxx/cmake/release/x86/build_output.txt index d33ab0c..bc40114 100644 --- a/app/.cxx/cmake/release/x86/build_output.txt +++ b/app/.cxx/cmake/release/x86/build_output.txt @@ -1,15 +1,13 @@ --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --- Check for working C compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -- works --- Detecting C compiler ABI info --- Detecting C compiler ABI info - done --- Detecting C compile features --- Detecting C compile features - done --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ --- Check for working CXX compiler: /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++ -- works --- Detecting CXX compiler ABI info --- Detecting CXX compiler ABI info - done --- Detecting CXX compile features --- Detecting CXX compile features - done --- Configuring done --- Generating done --- Build files have been written to: /home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86 \ No newline at end of file +Check for working C compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang +Check for working C compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang -- works +Detecting C compiler ABI info +Detecting C compiler ABI info - done +Detecting C compile features +Detecting C compile features - done +Check for working CXX compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ +Check for working CXX compiler: /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang++ -- works +Detecting CXX compiler ABI info +Detecting CXX compiler ABI info - done +Detecting CXX compile features +Detecting CXX compile features - done +Configuring done \ No newline at end of file diff --git a/app/.cxx/cmake/release/x86/cmake_install.cmake b/app/.cxx/cmake/release/x86/cmake_install.cmake index 723c68f..8b7b697 100644 --- a/app/.cxx/cmake/release/x86/cmake_install.cmake +++ b/app/.cxx/cmake/release/x86/cmake_install.cmake @@ -1,4 +1,4 @@ -# Install script for directory: /home/smartdrone/Working_Private/rosettadrone_work/app +# Install script for directory: /Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app # Set the install prefix if(NOT DEFINED CMAKE_INSTALL_PREFIX) @@ -29,7 +29,12 @@ endif() # Install shared libraries without execute permission? if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) - set(CMAKE_INSTALL_SO_NO_EXE "1") + set(CMAKE_INSTALL_SO_NO_EXE "0") +endif() + +# Is this installation the result of a crosscompile? +if(NOT DEFINED CMAKE_CROSSCOMPILING) + set(CMAKE_CROSSCOMPILING "TRUE") endif() if(CMAKE_INSTALL_COMPONENT) @@ -40,5 +45,5 @@ endif() string(REPLACE ";" "\n" CMAKE_INSTALL_MANIFEST_CONTENT "${CMAKE_INSTALL_MANIFEST_FILES}") -file(WRITE "/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86/${CMAKE_INSTALL_MANIFEST}" +file(WRITE "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86/${CMAKE_INSTALL_MANIFEST}" "${CMAKE_INSTALL_MANIFEST_CONTENT}") diff --git a/app/.cxx/cmake/release/x86/json_generation_record.json b/app/.cxx/cmake/release/x86/json_generation_record.json index c537852..644d766 100644 --- a/app/.cxx/cmake/release/x86/json_generation_record.json +++ b/app/.cxx/cmake/release/x86/json_generation_record.json @@ -1,14 +1,44 @@ [ { "level": "INFO", - "message": "Start JSON generation. Platform version: 22 min SDK version: x86" + "message": "Start JSON generation. Platform version: 22 min SDK version: x86", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|x86" }, { "level": "INFO", - "message": "JSON \u0027/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86/android_gradle_build.json\u0027 was up-to-date" + "message": "No CMake version was specified in build.gradle. Using default version 3.10.2.", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|x86" }, { "level": "INFO", - "message": "JSON generation completed without problems" + "message": "Trying to locate CMake in local SDK repository.", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|x86" + }, + { + "level": "INFO", + "message": "- CMake found in SDK at \u0027/Users/teni/Library/Android/sdk/cmake/3.10.2.4988404\u0027 had version \u00273.10.2\u0027", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|x86" + }, + { + "level": "INFO", + "message": "CMake \u00273.6.0\u0027 found in SDK did not match requested version \u00273.10.2\u0027.", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|x86" + }, + { + "level": "INFO", + "message": "JSON \u0027/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86/android_gradle_build.json\u0027 was up-to-date", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|x86" + }, + { + "level": "INFO", + "message": "JSON generation completed without problems", + "file": "/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/CMakeLists.txt", + "tag": "release|x86" } ] \ No newline at end of file diff --git a/app/.cxx/cmake/release/x86/rules.ninja b/app/.cxx/cmake/release/x86/rules.ninja index 4e33589..6952400 100644 --- a/app/.cxx/cmake/release/x86/rules.ninja +++ b/app/.cxx/cmake/release/x86/rules.ninja @@ -1,5 +1,5 @@ # CMAKE generated file: DO NOT EDIT! -# Generated by "Ninja" Generator, CMake Version 3.6 +# Generated by "Ninja" Generator, CMake Version 3.10 # This file contains all the rules used to get the outputs files # built from the input files. @@ -25,7 +25,7 @@ rule CUSTOM_COMMAND rule C_COMPILER__djivideojni depfile = $DEP_FILE deps = gcc - command = /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=i686-none-linux-android22 --gcc-toolchain=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64 --sysroot=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot $DEFINES $INCLUDES $FLAGS -MD -MT $out -MF $DEP_FILE -o $out -c $IN_ABS + command = /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang --target=i686-none-linux-android22 --gcc-toolchain=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64 --sysroot=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot $DEFINES $INCLUDES $FLAGS -MD -MT $out -MF $DEP_FILE -o $out -c $in description = Building C object $out @@ -33,7 +33,7 @@ rule C_COMPILER__djivideojni # Rule for linking C shared library. rule C_SHARED_LIBRARY_LINKER__djivideojni - command = $PRE_LINK && /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=i686-none-linux-android22 --gcc-toolchain=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64 --sysroot=/home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot -fPIC $LANGUAGE_COMPILE_FLAGS $ARCH_FLAGS $LINK_FLAGS -shared $SONAME_FLAG$SONAME -o $TARGET_FILE $in $LINK_PATH $LINK_LIBRARIES && $POST_BUILD + command = $PRE_LINK && /Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/bin/clang --target=i686-none-linux-android22 --gcc-toolchain=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64 --sysroot=/Users/teni/Library/Android/sdk/ndk/20.1.5948944/toolchains/llvm/prebuilt/darwin-x86_64/sysroot -fPIC $LANGUAGE_COMPILE_FLAGS $ARCH_FLAGS $LINK_FLAGS -shared $SONAME_FLAG$SONAME -o $TARGET_FILE $in $LINK_PATH $LINK_LIBRARIES && $POST_BUILD description = Linking C shared library $TARGET_FILE restat = $RESTAT @@ -42,7 +42,7 @@ rule C_SHARED_LIBRARY_LINKER__djivideojni # Rule for re-running cmake. rule RERUN_CMAKE - command = /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/cmake -H/home/smartdrone/Working_Private/rosettadrone_work/app -B/home/smartdrone/Working_Private/rosettadrone_work/app/.cxx/cmake/release/x86 + command = /Users/terjenilsen/Library/Android/sdk/cmake/3.10.2.4988404/bin/cmake -H/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app -B/Users/terjenilsen/Dropbox/Autonomy_Terje/rosettadrone_work/app/.cxx/cmake/release/x86 description = Re-running CMake... generator = 1 @@ -51,7 +51,7 @@ rule RERUN_CMAKE # Rule for cleaning all built files. rule CLEAN - command = /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja -t clean + command = /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -t clean description = Cleaning all built files... @@ -59,6 +59,6 @@ rule CLEAN # Rule for printing all primary targets available. rule HELP - command = /home/smartdrone/Android/Sdk/cmake/3.6.4111459/bin/ninja -t targets + command = /Users/teni/Library/Android/sdk/cmake/3.10.2.4988404/bin/ninja -t targets description = All primary targets available: diff --git a/app/.cxx/ndk_locator_record.json b/app/.cxx/ndk_locator_record.json index 3e76036..f2d4d22 100644 --- a/app/.cxx/ndk_locator_record.json +++ b/app/.cxx/ndk_locator_record.json @@ -1,13 +1,13 @@ { - "ndkFolder": "/home/smartdrone/Android/Sdk/ndk/21.3.6528147", + "ndkFolder": "/Users/teni/Library/Android/sdk/ndk/20.1.5948944", "messages": [ { "level": "INFO", - "message": "android.ndkVersion from module build.gradle is not set" + "message": "android.ndkVersion from module build.gradle is 20.1.5948944" }, { "level": "INFO", - "message": "ndk.dir in local.properties is /home/smartdrone/Android/Sdk/ndk/21.3.6528147" + "message": "ndk.dir in local.properties is not set" }, { "level": "INFO", @@ -15,35 +15,19 @@ }, { "level": "INFO", - "message": "sdkFolder is /home/smartdrone/Android/Sdk" + "message": "sdkFolder is /Users/teni/Library/Android/sdk" }, { "level": "INFO", - "message": "Considering /home/smartdrone/Android/Sdk/ndk/21.3.6528147 by ndk.dir" + "message": "Considering /Users/teni/Library/Android/sdk/ndk-bundle in SDK ndk-bundle folder" }, { "level": "INFO", - "message": "Considering /home/smartdrone/Android/Sdk/ndk-bundle in SDK ndk-bundle folder" + "message": "Considering /Users/teni/Library/Android/sdk/ndk/20.1.5948944 in SDK ndk folder" }, { "level": "INFO", - "message": "Considering /home/smartdrone/Android/Sdk/ndk/21.2.6472646 in SDK ndk folder" - }, - { - "level": "INFO", - "message": "Considering /home/smartdrone/Android/Sdk/ndk/21.3.6528147 in SDK ndk folder" - }, - { - "level": "INFO", - "message": "Considering /home/smartdrone/Android/Sdk/ndk/21.0.6113669 in SDK ndk folder" - }, - { - "level": "INFO", - "message": "Rejected /home/smartdrone/Android/Sdk/ndk/21.2.6472646 in SDK ndk folder because that location has no source.properties" - }, - { - "level": "INFO", - "message": "Found requested ndk.dir (/home/smartdrone/Android/Sdk/ndk/21.3.6528147) which has version 21.3.6528147" + "message": "Found requested NDK version 20.1.5948944 at /Users/teni/Library/Android/sdk/ndk/20.1.5948944" } ] } \ No newline at end of file diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 10006ea..d4e2b4b 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -13,16 +13,16 @@ cmake_minimum_required(VERSION 3.4.1) #set(log-lib /home/smartdrone/Android/Sdk/ndk/21.3.6528147/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/22/liblog.so) include_directories(${CMAKE_SOURCE_DIR}/src/main/cpp/ ${CMAKE_SOURCE_DIR}/src/main/cpp/include - ${CMAKE_SOURCE_DIR}/src/main/cpp/gstreamer-1.0/armv7/include/gstreamer-1.0 - ${CMAKE_SOURCE_DIR}/src/main/cpp/gstreamer-1.0/armv7/include/glib-2.0 - ${CMAKE_SOURCE_DIR}/src/main/cpp/gstreamer-1.0/armv7/lib/glib-2.0/include) + ${CMAKE_SOURCE_DIR}/src/main/cpp/gstreamer-1.0/armv7/include/gstreamer-1.0 + ${CMAKE_SOURCE_DIR}/src/main/cpp/gstreamer-1.0/armv7/include/glib-2.0 + ${CMAKE_SOURCE_DIR}/src/main/cpp/gstreamer-1.0/armv7/lib/glib-2.0/include) # /home/smartdrone/Android/Sdk/ndk/21.3.6528147/sysroot/usr/include) set(gst_DIR ${CMAKE_SOURCE_DIR}/src/main/cpp/lib) add_library(gstreamer_android SHARED IMPORTED) set_target_properties(gstreamer_android PROPERTIES IMPORTED_LOCATION - ${gst_DIR}/${ANDROID_ABI}/libgstreamer_android.so) + ${gst_DIR}/${ANDROID_ABI}/libgstreamer_android.so) add_library(c++_shared SHARED IMPORTED) set_target_properties(c++_shared PROPERTIES IMPORTED_LOCATION @@ -33,18 +33,18 @@ set(ffmpeg_DIR ${CMAKE_SOURCE_DIR}/src/main/cpp/lib) add_library(ffmpegjni SHARED IMPORTED) set_target_properties(ffmpegjni PROPERTIES IMPORTED_LOCATION - ${ffmpeg_DIR}/${ANDROID_ABI}/libffmpeg.so) + ${ffmpeg_DIR}/${ANDROID_ABI}/libffmpeg.so) add_library( # Specifies the name of the library. - djivideojni + djivideojni - # Sets the library as a shared library. - SHARED + # Sets the library as a shared library. + SHARED - # Provides a relative path to your source file(s). - src/main/cpp/dji_video_jni.c ) + # Provides a relative path to your source file(s). + src/main/cpp/dji_video_jni.c) -find_library( log-lib log ) +find_library(log-lib log) -target_link_libraries( djivideojni ffmpegjni ${log-lib} ) +target_link_libraries(djivideojni ffmpegjni ${log-lib}) diff --git a/app/build.gradle b/app/build.gradle index 207a337..0516042 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,7 +7,7 @@ android { minSdkVersion 22 targetSdkVersion 28 versionCode 1 - versionName "5.1.0" + versionName '5.1.1' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true } @@ -21,14 +21,21 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + debug { + minifyEnabled false + debuggable true + jniDebuggable true + renderscriptDebuggable true + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } } - packagingOptions{ + packagingOptions { exclude 'META-INF/rxjava.properties' } sourceSets { main { - jni.srcDirs=[] + jni.srcDirs = [] } } @@ -68,7 +75,7 @@ android { } defaultConfig { ndk { - // abiFilters 'armeabi-v7a' + // abiFilters 'armeabi-v7a' // abiFilters 'armeabi-v7a', 'arm64-v8a' abiFilters 'armeabi-v7a', 'x86', 'arm64-v8a' } @@ -79,6 +86,10 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } + // We need to be restrict as we get error on newer versions... + buildToolsVersion '30.0.2' + ndkVersion '20.1.5948944' + } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') @@ -104,27 +115,27 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.preference:preference:1.1.1' implementation 'androidx.legacy:legacy-preference-v14:1.0.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.1' + implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'com.google.android.material:material:1.2.1' - testImplementation 'junit:junit:4.13' + testImplementation 'junit:junit:4.13.1' testImplementation 'org.mockito:mockito-core:2.7.22' testImplementation 'org.mockito:mockito-android:2.7.22' implementation 'androidx.multidex:multidex:2.0.1' - implementation 'androidx.core:core:1.3.1' + implementation 'androidx.core:core:1.3.2' implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'com.google.android.gms:play-services-maps:17.0.0' - implementation 'com.google.android.gms:play-services-basement:17.4.0' - implementation 'com.google.android.gms:play-services-base:17.4.0' + implementation 'com.google.android.gms:play-services-basement:17.5.0' + implementation 'com.google.android.gms:play-services-base:17.5.0' implementation 'com.google.android.gms:play-services-gcm:17.0.0' - implementation 'com.google.android.gms:play-services-location:17.0.0' + implementation 'com.google.android.gms:play-services-location:17.1.0' implementation 'com.jakewharton:butterknife:10.2.3' annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3' - implementation 'androidx.core:core-ktx:1.3.1' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0-alpha07' + implementation 'androidx.core:core-ktx:1.3.2' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0-beta01' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50" + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.20' } diff --git a/app/src/.DS_Store b/app/src/.DS_Store index 254fc3a..0787fb7 100644 Binary files a/app/src/.DS_Store and b/app/src/.DS_Store differ diff --git a/app/src/androidTest/java/sq/rogue/rosettadrone/ExampleInstrumentedTest.java b/app/src/androidTest/java/sq/rogue/rosettadrone/ExampleInstrumentedTest.java index 9812fec..fa6cbd5 100644 --- a/app/src/androidTest/java/sq/rogue/rosettadrone/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/sq/rogue/rosettadrone/ExampleInstrumentedTest.java @@ -1,13 +1,14 @@ package sq.rogue.rosettadrone; import android.content.Context; -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; -import static org.junit.Assert.*; +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; + +import static org.junit.Assert.assertEquals; /** * Instrumentation test, which will execute on an Android device. diff --git a/app/src/main/.DS_Store b/app/src/main/.DS_Store index db52307..f174374 100644 Binary files a/app/src/main/.DS_Store and b/app/src/main/.DS_Store differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2421b95..04d60f9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,30 +3,34 @@ xmlns:tools="http://schemas.android.com/tools" package="sq.rogue.rosettadrone"> - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + android:required="true" /> + android:required="true" /> - - - + + + + + android:resource="@xml/accessory_filter" /> + + - - - - + - - - - - - + android:label="Settings"> - - + - - + - - + + + + + + + + - - - - - - - + android:value="@string/dji_key" /> + diff --git a/app/src/main/cpp/dji_video_jni.c b/app/src/main/cpp/dji_video_jni.c index d0b8ed5..911391a 100644 --- a/app/src/main/cpp/dji_video_jni.c +++ b/app/src/main/cpp/dji_video_jni.c @@ -60,7 +60,7 @@ void invokeFrameDataCallback(JNIEnv *env, jobject obj, uint8_t *buf, int size, i int isKeyFrame, int width, int height) { jbyte *buff = (jbyte *) buf; jbyteArray jarray = (*env)->NewByteArray(env, size); - (*env)->SetByteArrayRegion(env, jarray, 0, size, (const signed char *)buf); + (*env)->SetByteArrayRegion(env, jarray, 0, size, (const signed char *) buf); (*env)->CallVoidMethod(env, obj, dataCallbackMID, jarray, size, frameNum, isKeyFrame != 0, width, height); } @@ -135,7 +135,8 @@ int parse(JNIEnv *env, jobject obj, uint8_t *pBuff, int videosize, uint64_t pts) paserLength_In -= paserLen; pFrameBuff += paserLen; - if (packet.size > 0 & m_pCodecPaser->width_in_pixel > 10 & m_pCodecPaser->height_in_pixel > 10) { + if (packet.size > 0 & m_pCodecPaser->width_in_pixel > 10 & + m_pCodecPaser->height_in_pixel > 10) { /* LOGD( "packet size=%d, pts=%lld, width_in_pixel=%d, height_in_pixel=%d, key_frame=%d, frame_has_sps=%d, frame_has_pps=%d, frame_num=%d", @@ -172,7 +173,7 @@ int parse(JNIEnv *env, jobject obj, uint8_t *pBuff, int videosize, uint64_t pts) */ int noparse(JNIEnv *env, jobject obj, uint8_t *pBuff, int videosize) { - if (videosize > 0){ + if (videosize > 0) { invokeFrameDataCallback( env, obj, @@ -198,14 +199,14 @@ uint8_t audaudsize2 = 12; */ JNIEXPORT jboolean Java_sq_rogue_rosettadrone_video_NativeHelper_parse(JNIEnv *env, jobject obj, jbyteArray pBuff, - int size, int mode) { + int size, int mode) { jbyte *jBuff = (jbyte *) ((*env)->GetByteArrayElements(env, pBuff, 0)); uint8_t *buff = (uint8_t *) jBuff; uint64_t pts = 0; jbyte *jBuff2; - if(mode) - noparse(env,obj,buff,size); + if (mode) + noparse(env, obj, buff, size); else { // LOGD("pts=%llu", pts); diff --git a/app/src/main/cpp/include/freetype2/freetype/freetype.h b/app/src/main/cpp/include/freetype2/freetype/freetype.h index 4e5d2ec..7a41ea5 100644 --- a/app/src/main/cpp/include/freetype2/freetype/freetype.h +++ b/app/src/main/cpp/include/freetype2/freetype/freetype.h @@ -667,7 +667,7 @@ typedef enum FT_Encoding_ { FT_ENC_TAG(FT_ENCODING_JOHAB, 'j', 'o', 'h', 'a'), /* for backwards compatibility */ - FT_ENCODING_MS_SJIS = FT_ENCODING_SJIS, + FT_ENCODING_MS_SJIS = FT_ENCODING_SJIS, FT_ENCODING_MS_GB2312 = FT_ENCODING_GB2312, FT_ENCODING_MS_BIG5 = FT_ENCODING_BIG5, FT_ENCODING_MS_WANSUNG = FT_ENCODING_WANSUNG, diff --git a/app/src/main/cpp/include/freetype2/freetype/ftrender.h b/app/src/main/cpp/include/freetype2/freetype/ftrender.h index 17dc3a1..28639a1 100644 --- a/app/src/main/cpp/include/freetype2/freetype/ftrender.h +++ b/app/src/main/cpp/include/freetype2/freetype/ftrender.h @@ -38,8 +38,11 @@ FT_BEGIN_HEADER /* create a new glyph object */ typedef FT_Error - (*FT_Glyph_InitFunc)(FT_Glyph glyph, - FT_GlyphSlot slot); + (*FT_Glyph_InitFunc) +( +FT_Glyph glyph, + FT_GlyphSlot +slot); /* destroys a given glyph object */ typedef void diff --git a/app/src/main/cpp/include/freetype2/freetype/t1tables.h b/app/src/main/cpp/include/freetype2/freetype/t1tables.h index fae08ce..b902b7a 100644 --- a/app/src/main/cpp/include/freetype2/freetype/t1tables.h +++ b/app/src/main/cpp/include/freetype2/freetype/t1tables.h @@ -190,12 +190,12 @@ typedef PS_PrivateRec T1_Private; /* */ typedef enum T1_Blend_Flags_ { /*# required fields in a FontInfo blend dictionary */ - T1_BLEND_UNDERLINE_POSITION = 0, + T1_BLEND_UNDERLINE_POSITION = 0, T1_BLEND_UNDERLINE_THICKNESS, T1_BLEND_ITALIC_ANGLE, /*# required fields in a Private blend dictionary */ - T1_BLEND_BLUE_VALUES, + T1_BLEND_BLUE_VALUES, T1_BLEND_OTHER_BLUES, T1_BLEND_STANDARD_WIDTH, T1_BLEND_STANDARD_HEIGHT, @@ -208,7 +208,7 @@ typedef enum T1_Blend_Flags_ { T1_BLEND_FORCE_BOLD, /*# never remove */ - T1_BLEND_MAX + T1_BLEND_MAX } T1_Blend_Flags; @@ -522,7 +522,7 @@ typedef enum T1_EncodingType_ { /* */ typedef enum PS_Dict_Keys_ { /* conventionally in the font dictionary */ - PS_DICT_FONT_TYPE, /* FT_Byte */ + PS_DICT_FONT_TYPE, /* FT_Byte */ PS_DICT_FONT_MATRIX, /* FT_Fixed */ PS_DICT_FONT_BBOX, /* FT_Fixed */ PS_DICT_PAINT_TYPE, /* FT_Byte */ @@ -535,7 +535,7 @@ typedef enum PS_Dict_Keys_ { PS_DICT_ENCODING_ENTRY, /* FT_String* */ /* conventionally in the font Private dictionary */ - PS_DICT_NUM_SUBRS, /* FT_Int */ + PS_DICT_NUM_SUBRS, /* FT_Int */ PS_DICT_SUBR, /* FT_String* */ PS_DICT_STD_HW, /* FT_UShort */ PS_DICT_STD_VW, /* FT_UShort */ @@ -562,7 +562,7 @@ typedef enum PS_Dict_Keys_ { PS_DICT_LANGUAGE_GROUP, /* FT_Long */ /* conventionally in the font FontInfo dictionary */ - PS_DICT_VERSION, /* FT_String* */ + PS_DICT_VERSION, /* FT_String* */ PS_DICT_NOTICE, /* FT_String* */ PS_DICT_FULL_NAME, /* FT_String* */ PS_DICT_FAMILY_NAME, /* FT_String* */ diff --git a/app/src/main/cpp/include/freetype2/freetype/ttunpat.h b/app/src/main/cpp/include/freetype2/freetype/ttunpat.h index 2c9b023..b7d5db8 100644 --- a/app/src/main/cpp/include/freetype2/freetype/ttunpat.h +++ b/app/src/main/cpp/include/freetype2/freetype/ttunpat.h @@ -50,7 +50,7 @@ FT_BEGIN_HEADER /* */ - FT_END_HEADER +FT_END_HEADER #endif /* __TTUNPAT_H__ */ diff --git a/app/src/main/cpp/include/libavcodec/avcodec.h b/app/src/main/cpp/include/libavcodec/avcodec.h index 478b604..ff636cf 100644 --- a/app/src/main/cpp/include/libavcodec/avcodec.h +++ b/app/src/main/cpp/include/libavcodec/avcodec.h @@ -103,7 +103,7 @@ enum AVCodecID { AV_CODEC_ID_NONE, /* video codecs */ - AV_CODEC_ID_MPEG1VIDEO, + AV_CODEC_ID_MPEG1VIDEO, AV_CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding #if FF_API_XVMC AV_CODEC_ID_MPEG2VIDEO_XVMC, @@ -322,7 +322,7 @@ enum AVCodecID { AV_CODEC_ID_APNG = MKBETAG('A', 'P', 'N', 'G'), /* various PCM "codecs" */ - AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs + AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs AV_CODEC_ID_PCM_S16LE = 0x10000, AV_CODEC_ID_PCM_S16BE, AV_CODEC_ID_PCM_U16LE, @@ -358,7 +358,7 @@ enum AVCodecID { AV_CODEC_ID_PCM_S16BE_PLANAR = MKBETAG('P', 'S', 'P', 16), /* various ADPCM codecs */ - AV_CODEC_ID_ADPCM_IMA_QT = 0x11000, + AV_CODEC_ID_ADPCM_IMA_QT = 0x11000, AV_CODEC_ID_ADPCM_IMA_WAV, AV_CODEC_ID_ADPCM_IMA_DK3, AV_CODEC_ID_ADPCM_IMA_DK4, @@ -398,21 +398,21 @@ enum AVCodecID { AV_CODEC_ID_ADPCM_G726LE = MKBETAG('6', '2', '7', 'G'), /* AMR */ - AV_CODEC_ID_AMR_NB = 0x12000, + AV_CODEC_ID_AMR_NB = 0x12000, AV_CODEC_ID_AMR_WB, /* RealAudio codecs*/ - AV_CODEC_ID_RA_144 = 0x13000, + AV_CODEC_ID_RA_144 = 0x13000, AV_CODEC_ID_RA_288, /* various DPCM codecs */ - AV_CODEC_ID_ROQ_DPCM = 0x14000, + AV_CODEC_ID_ROQ_DPCM = 0x14000, AV_CODEC_ID_INTERPLAY_DPCM, AV_CODEC_ID_XAN_DPCM, AV_CODEC_ID_SOL_DPCM, /* audio codecs */ - AV_CODEC_ID_MP2 = 0x15000, + AV_CODEC_ID_MP2 = 0x15000, AV_CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3 AV_CODEC_ID_AAC, AV_CODEC_ID_AC3, @@ -495,7 +495,7 @@ enum AVCodecID { AV_CODEC_ID_DSD_MSBF_PLANAR = MKBETAG('D', 'S', 'D', '8'), /* subtitle codecs */ - AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. + AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. AV_CODEC_ID_DVD_SUBTITLE = 0x17000, AV_CODEC_ID_DVB_SUBTITLE, AV_CODEC_ID_TEXT, ///< raw UTF-8 text @@ -521,7 +521,7 @@ enum AVCodecID { AV_CODEC_ID_ASS = MKBETAG('A', 'S', 'S', ' '), ///< ASS as defined in Matroska /* other specific kind of codecs (generally used for attachments) */ - AV_CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs. + AV_CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs. AV_CODEC_ID_TTF = 0x18000, AV_CODEC_ID_BINTEXT = MKBETAG('B', 'T', 'X', 'T'), AV_CODEC_ID_XBIN = MKBETAG('X', 'B', 'I', 'N'), @@ -656,7 +656,7 @@ enum Motion_Est_ID { enum AVDiscard { /* We leave some space between them for extensions (drop some * keyframes for intra-only or drop just some bidir frames). */ - AVDISCARD_NONE = -16, ///< discard nothing + AVDISCARD_NONE = -16, ///< discard nothing AVDISCARD_DEFAULT = 0, ///< discard useless packets like 0 size packets in avi AVDISCARD_NONREF = 8, ///< discard all non reference AVDISCARD_BIDIR = 16, ///< discard all bidirectional frames @@ -989,7 +989,7 @@ enum AVPacketSideDataType { * s32le height * @endcode */ - AV_PKT_DATA_PARAM_CHANGE, + AV_PKT_DATA_PARAM_CHANGE, /** * An AV_PKT_DATA_H263_MB_INFO side data packet contains a number of @@ -1010,13 +1010,13 @@ enum AVPacketSideDataType { * u8 vertical MV predictor for block number 3 * @endcode */ - AV_PKT_DATA_H263_MB_INFO, + AV_PKT_DATA_H263_MB_INFO, /** * This side data should be associated with an audio stream and contains * ReplayGain information in form of the AVReplayGain struct. */ - AV_PKT_DATA_REPLAYGAIN, + AV_PKT_DATA_REPLAYGAIN, /** * This side data contains a 3x3 transformation matrix describing an affine @@ -1025,13 +1025,13 @@ enum AVPacketSideDataType { * * See libavutil/display.h for a detailed description of the data. */ - AV_PKT_DATA_DISPLAYMATRIX, + AV_PKT_DATA_DISPLAYMATRIX, /** * This side data should be associated with a video stream and contains * Stereoscopic 3D information in form of the AVStereo3D struct. */ - AV_PKT_DATA_STEREO3D, + AV_PKT_DATA_STEREO3D, /** * Recommmends skipping the specified number of samples @@ -1042,7 +1042,7 @@ enum AVPacketSideDataType { * u8 reason for end skip (0=padding silence, 1=convergence) * @endcode */ - AV_PKT_DATA_SKIP_SAMPLES = 70, + AV_PKT_DATA_SKIP_SAMPLES = 70, /** * An AV_PKT_DATA_JP_DUALMONO side data packet indicates that @@ -1052,13 +1052,13 @@ enum AVPacketSideDataType { * u8 selected channels (0=mail/left, 1=sub/right, 2=both) * @endcode */ - AV_PKT_DATA_JP_DUALMONO, + AV_PKT_DATA_JP_DUALMONO, /** * A list of zero terminated key/value strings. There is no end marker for * the list, so it is required to rely on the side data size to stop. */ - AV_PKT_DATA_STRINGS_METADATA, + AV_PKT_DATA_STRINGS_METADATA, /** * Subtitle event position @@ -1069,7 +1069,7 @@ enum AVPacketSideDataType { * u32le y2 * @endcode */ - AV_PKT_DATA_SUBTITLE_POSITION, + AV_PKT_DATA_SUBTITLE_POSITION, /** * Data found in BlockAdditional element of matroska container. There is @@ -1077,25 +1077,25 @@ enum AVPacketSideDataType { * size to recognize the end. 8 byte id (as found in BlockAddId) followed * by data. */ - AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, + AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, /** * The optional first identifier line of a WebVTT cue. */ - AV_PKT_DATA_WEBVTT_IDENTIFIER, + AV_PKT_DATA_WEBVTT_IDENTIFIER, /** * The optional settings (rendering instructions) that immediately * follow the timestamp specifier of a WebVTT cue. */ - AV_PKT_DATA_WEBVTT_SETTINGS, + AV_PKT_DATA_WEBVTT_SETTINGS, /** * A list of zero terminated key/value strings. There is no end marker for * the list, so it is required to rely on the side data size to stop. This * side data includes updated metadata which appeared in the stream. */ - AV_PKT_DATA_METADATA_UPDATE, + AV_PKT_DATA_METADATA_UPDATE, }; typedef struct AVPacketSideData { @@ -2962,9 +2962,9 @@ typedef struct AVCodecContext { * @deprecated this field is not supposed to be accessed from outside lavc */ attribute_deprecated - AVPacket - * - pkt; + AVPacket + * + pkt; #endif /** @@ -3453,13 +3453,13 @@ enum AVSubtitleType { * Plain text, the text field must be set by the decoder and is * authoritative. ass and pict fields may contain approximations. */ - SUBTITLE_TEXT, + SUBTITLE_TEXT, /** * Formatted text, the ass field must be set by the decoder and is * authoritative. pict and text fields may contain approximations. */ - SUBTITLE_ASS, + SUBTITLE_ASS, }; #define AV_SUBTITLE_FLAG_FORCED 0x00000001 @@ -3644,6 +3644,7 @@ void avcodec_get_frame_defaults(AVFrame *frame); */ attribute_deprecated void avcodec_free_frame(AVFrame **frame); + #endif /** @@ -4489,6 +4490,7 @@ AVCodec *avcodec_find_encoder(enum AVCodecID id); AVCodec *avcodec_find_encoder_by_name(const char *name); #if FF_API_OLD_ENCODE_AUDIO + /** * Encode an audio frame from samples into buf. * @@ -4515,11 +4517,12 @@ AVCodec *avcodec_find_encoder_by_name(const char *name); */ int attribute_deprecated avcodec_encode_audio(AVCodecContext -*avctx, -uint8_t *buf, -int buf_size, -const short *samples + *avctx, + uint8_t *buf, + int buf_size, + const short *samples ); + #endif /** @@ -4661,7 +4664,7 @@ typedef struct ReSampleContext ReSampleContext; * @return allocated ReSampleContext, NULL if error occurred */ attribute_deprecated - ReSampleContext +ReSampleContext * av_audio_resample_init(int output_channels, int input_channels, @@ -5227,6 +5230,7 @@ attribute_deprecated void av_log_ask_for_sample(void *avc, const char *msg, ...) av_printf_format(2, 3); + #endif /* FF_API_MISSING_SAMPLE */ /** diff --git a/app/src/main/cpp/include/libavcodec/old_codec_ids.h b/app/src/main/cpp/include/libavcodec/old_codec_ids.h index d9b8922..e4fc252 100644 --- a/app/src/main/cpp/include/libavcodec/old_codec_ids.h +++ b/app/src/main/cpp/include/libavcodec/old_codec_ids.h @@ -30,7 +30,7 @@ CODEC_ID_NONE = AV_CODEC_ID_NONE, /* video codecs */ - CODEC_ID_MPEG1VIDEO, +CODEC_ID_MPEG1VIDEO, CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding #if FF_API_XVMC CODEC_ID_MPEG2VIDEO_XVMC, @@ -215,8 +215,8 @@ CODEC_ID_MPEG2VIDEO_XVMC, CODEC_ID_SNOW = AV_CODEC_ID_SNOW, /* various PCM "codecs" */ - CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs - CODEC_ID_PCM_S16LE = 0x10000, +CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs +CODEC_ID_PCM_S16LE = 0x10000, CODEC_ID_PCM_S16BE, CODEC_ID_PCM_U16LE, CODEC_ID_PCM_U16BE, @@ -246,7 +246,7 @@ CODEC_ID_MPEG2VIDEO_XVMC, CODEC_ID_PCM_S8_PLANAR, /* various ADPCM codecs */ - CODEC_ID_ADPCM_IMA_QT = 0x11000, +CODEC_ID_ADPCM_IMA_QT = 0x11000, CODEC_ID_ADPCM_IMA_WAV, CODEC_ID_ADPCM_IMA_DK3, CODEC_ID_ADPCM_IMA_DK4, @@ -279,23 +279,23 @@ CODEC_ID_MPEG2VIDEO_XVMC, CODEC_ID_VIMA = MKBETAG('V', 'I', 'M', 'A'), /* AMR */ - CODEC_ID_AMR_NB = 0x12000, +CODEC_ID_AMR_NB = 0x12000, CODEC_ID_AMR_WB, /* RealAudio codecs*/ - CODEC_ID_RA_144 = 0x13000, +CODEC_ID_RA_144 = 0x13000, CODEC_ID_RA_288, /* various DPCM codecs */ - CODEC_ID_ROQ_DPCM = 0x14000, +CODEC_ID_ROQ_DPCM = 0x14000, CODEC_ID_INTERPLAY_DPCM, CODEC_ID_XAN_DPCM, CODEC_ID_SOL_DPCM, /* audio codecs */ - CODEC_ID_MP2 = 0x15000, +CODEC_ID_MP2 = 0x15000, CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3 - CODEC_ID_AAC, +CODEC_ID_AAC, CODEC_ID_AC3, CODEC_ID_DTS, CODEC_ID_VORBIS, @@ -312,7 +312,7 @@ CODEC_ID_MPEG2VIDEO_XVMC, CODEC_ID_ALAC, CODEC_ID_WESTWOOD_SND1, CODEC_ID_GSM, ///< as in Berlin toast format - CODEC_ID_QDM2, +CODEC_ID_QDM2, CODEC_ID_COOK, CODEC_ID_TRUESPEECH, CODEC_ID_TTA, @@ -324,7 +324,7 @@ CODEC_ID_MPEG2VIDEO_XVMC, CODEC_ID_MUSEPACK7, CODEC_ID_MLP, CODEC_ID_GSM_MS, /* as found in WAV */ - CODEC_ID_ATRAC3, +CODEC_ID_ATRAC3, CODEC_ID_VOXWARE, CODEC_ID_APE, CODEC_ID_NELLYMOSER, @@ -361,11 +361,11 @@ CODEC_ID_MPEG2VIDEO_XVMC, CODEC_ID_OPUS = MKBETAG('O', 'P', 'U', 'S'), /* subtitle codecs */ - CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. - CODEC_ID_DVD_SUBTITLE = 0x17000, +CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. +CODEC_ID_DVD_SUBTITLE = 0x17000, CODEC_ID_DVB_SUBTITLE, CODEC_ID_TEXT, ///< raw UTF-8 text - CODEC_ID_XSUB, +CODEC_ID_XSUB, CODEC_ID_SSA, CODEC_ID_MOV_TEXT, CODEC_ID_HDMV_PGS_SUBTITLE, @@ -379,8 +379,8 @@ CODEC_ID_MPEG2VIDEO_XVMC, CODEC_ID_SUBVIEWER = MKBETAG('S', 'u', 'b', 'V'), /* other specific kind of codecs (generally used for attachments) */ - CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs. - CODEC_ID_TTF = 0x18000, +CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs. +CODEC_ID_TTF = 0x18000, CODEC_ID_BINTEXT = MKBETAG('B', 'T', 'X', 'T'), CODEC_ID_XBIN = MKBETAG('X', 'B', 'I', 'N'), CODEC_ID_IDF = MKBETAG(0, 'I', 'D', 'F'), @@ -388,10 +388,10 @@ CODEC_ID_MPEG2VIDEO_XVMC, CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it - CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS +CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS * stream (only used by libavformat) */ - CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems +CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems * stream (only used by libavformat) */ - CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information. +CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information. #endif /* AVCODEC_OLD_CODEC_IDS_H */ diff --git a/app/src/main/cpp/include/libavcodec/vdpau.h b/app/src/main/cpp/include/libavcodec/vdpau.h index 92ee17a..d570efe 100644 --- a/app/src/main/cpp/include/libavcodec/vdpau.h +++ b/app/src/main/cpp/include/libavcodec/vdpau.h @@ -167,8 +167,11 @@ void av_vdpau_hwaccel_set_render2(AVVDPAUContext *, AVVDPAU_Render2); * * @return 0 on success, an AVERROR code on failure. */ -int av_vdpau_bind_context(AVCodecContext *avctx, VdpDevice device, - VdpGetProcAddress *get_proc_address, unsigned flags); +int av_vdpau_bind_context(AVCodecContext * avctx, VdpDevice +device, +VdpGetProcAddress *get_proc_address, +unsigned flags +); /** * Allocate an AVVDPAUContext. @@ -188,7 +191,7 @@ AVVDPAUContext *av_vdpau_alloc_context(void); * * @return 0 on success (non-negative), a negative AVERROR on failure. */ -int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile); +int av_vdpau_get_profile(AVCodecContext * avctx, VdpDecoderProfile * profile); #if FF_API_CAP_VDPAU /** @brief The videoSurface is used for rendering. */ diff --git a/app/src/main/cpp/include/libavdevice/avdevice.h b/app/src/main/cpp/include/libavdevice/avdevice.h index 4b52ecc..425cbfe 100644 --- a/app/src/main/cpp/include/libavdevice/avdevice.h +++ b/app/src/main/cpp/include/libavdevice/avdevice.h @@ -119,7 +119,7 @@ enum AVAppToDevMessageType { /** * Dummy message. */ - AV_APP_TO_DEV_NONE = MKBETAG('N', 'O', 'N', 'E'), + AV_APP_TO_DEV_NONE = MKBETAG('N', 'O', 'N', 'E'), /** * Window size change message. @@ -130,7 +130,7 @@ enum AVAppToDevMessageType { * * data: AVDeviceRect: new window size. */ - AV_APP_TO_DEV_WINDOW_SIZE = MKBETAG('G', 'E', 'O', 'M'), + AV_APP_TO_DEV_WINDOW_SIZE = MKBETAG('G', 'E', 'O', 'M'), /** * Repaint request message. @@ -140,7 +140,7 @@ enum AVAppToDevMessageType { * data: AVDeviceRect: area required to be repainted. * NULL: whole area is required to be repainted. */ - AV_APP_TO_DEV_WINDOW_REPAINT = MKBETAG('R', 'E', 'P', 'A'), + AV_APP_TO_DEV_WINDOW_REPAINT = MKBETAG('R', 'E', 'P', 'A'), /** * Request pause/play. @@ -151,7 +151,7 @@ enum AVAppToDevMessageType { * * data: NULL */ - AV_APP_TO_DEV_PAUSE = MKBETAG('P', 'A', 'U', ' '), + AV_APP_TO_DEV_PAUSE = MKBETAG('P', 'A', 'U', ' '), AV_APP_TO_DEV_PLAY = MKBETAG('P', 'L', 'A', 'Y'), AV_APP_TO_DEV_TOGGLE_PAUSE = MKBETAG('P', 'A', 'U', 'T'), @@ -164,7 +164,7 @@ enum AVAppToDevMessageType { * * data: double: new volume with range of 0.0 - 1.0. */ - AV_APP_TO_DEV_SET_VOLUME = MKBETAG('S', 'V', 'O', 'L'), + AV_APP_TO_DEV_SET_VOLUME = MKBETAG('S', 'V', 'O', 'L'), /** * Mute control messages. @@ -175,7 +175,7 @@ enum AVAppToDevMessageType { * * data: NULL. */ - AV_APP_TO_DEV_MUTE = MKBETAG(' ', 'M', 'U', 'T'), + AV_APP_TO_DEV_MUTE = MKBETAG(' ', 'M', 'U', 'T'), AV_APP_TO_DEV_UNMUTE = MKBETAG('U', 'M', 'U', 'T'), AV_APP_TO_DEV_TOGGLE_MUTE = MKBETAG('T', 'M', 'U', 'T'), @@ -187,7 +187,7 @@ enum AVAppToDevMessageType { * * data: NULL. */ - AV_APP_TO_DEV_GET_VOLUME = MKBETAG('G', 'V', 'O', 'L'), + AV_APP_TO_DEV_GET_VOLUME = MKBETAG('G', 'V', 'O', 'L'), AV_APP_TO_DEV_GET_MUTE = MKBETAG('G', 'M', 'U', 'T'), }; @@ -198,7 +198,7 @@ enum AVDevToAppMessageType { /** * Dummy message. */ - AV_DEV_TO_APP_NONE = MKBETAG('N', 'O', 'N', 'E'), + AV_DEV_TO_APP_NONE = MKBETAG('N', 'O', 'N', 'E'), /** * Create window buffer message. @@ -214,7 +214,7 @@ enum AVDevToAppMessageType { * data: AVDeviceRect: preferred size of the window buffer. * NULL: no preferred size of the window buffer. */ - AV_DEV_TO_APP_CREATE_WINDOW_BUFFER = MKBETAG('B', 'C', 'R', 'E'), + AV_DEV_TO_APP_CREATE_WINDOW_BUFFER = MKBETAG('B', 'C', 'R', 'E'), /** * Prepare window buffer message. @@ -225,7 +225,7 @@ enum AVDevToAppMessageType { * * data: NULL. */ - AV_DEV_TO_APP_PREPARE_WINDOW_BUFFER = MKBETAG('B', 'P', 'R', 'E'), + AV_DEV_TO_APP_PREPARE_WINDOW_BUFFER = MKBETAG('B', 'P', 'R', 'E'), /** * Display window buffer message. @@ -236,7 +236,7 @@ enum AVDevToAppMessageType { * * data: NULL. */ - AV_DEV_TO_APP_DISPLAY_WINDOW_BUFFER = MKBETAG('B', 'D', 'I', 'S'), + AV_DEV_TO_APP_DISPLAY_WINDOW_BUFFER = MKBETAG('B', 'D', 'I', 'S'), /** * Destroy window buffer message. @@ -247,7 +247,7 @@ enum AVDevToAppMessageType { * * data: NULL. */ - AV_DEV_TO_APP_DESTROY_WINDOW_BUFFER = MKBETAG('B', 'D', 'E', 'S'), + AV_DEV_TO_APP_DESTROY_WINDOW_BUFFER = MKBETAG('B', 'D', 'E', 'S'), /** * Buffer fullness status messages. @@ -256,7 +256,7 @@ enum AVDevToAppMessageType { * * data: NULL. */ - AV_DEV_TO_APP_BUFFER_OVERFLOW = MKBETAG('B', 'O', 'F', 'L'), + AV_DEV_TO_APP_BUFFER_OVERFLOW = MKBETAG('B', 'O', 'F', 'L'), AV_DEV_TO_APP_BUFFER_UNDERFLOW = MKBETAG('B', 'U', 'F', 'L'), /** @@ -270,7 +270,7 @@ enum AVDevToAppMessageType { * data: int64_t: amount of bytes available to read/write. * NULL: amount of bytes available to read/write is not known. */ - AV_DEV_TO_APP_BUFFER_READABLE = MKBETAG('B', 'R', 'D', ' '), + AV_DEV_TO_APP_BUFFER_READABLE = MKBETAG('B', 'R', 'D', ' '), AV_DEV_TO_APP_BUFFER_WRITABLE = MKBETAG('B', 'W', 'R', ' '), /** @@ -280,7 +280,7 @@ enum AVDevToAppMessageType { * * data: int: 0 for not muted state, non-zero for muted state. */ - AV_DEV_TO_APP_MUTE_STATE_CHANGED = MKBETAG('C', 'M', 'U', 'T'), + AV_DEV_TO_APP_MUTE_STATE_CHANGED = MKBETAG('C', 'M', 'U', 'T'), /** * Volume level change message. @@ -289,7 +289,7 @@ enum AVDevToAppMessageType { * * data: double: new volume with range of 0.0 - 1.0. */ - AV_DEV_TO_APP_VOLUME_LEVEL_CHANGED = MKBETAG('C', 'V', 'O', 'L'), + AV_DEV_TO_APP_VOLUME_LEVEL_CHANGED = MKBETAG('C', 'V', 'O', 'L'), }; /** diff --git a/app/src/main/cpp/include/libavfilter/avfilter.h b/app/src/main/cpp/include/libavfilter/avfilter.h index a9550bc..57f47ea 100644 --- a/app/src/main/cpp/include/libavfilter/avfilter.h +++ b/app/src/main/cpp/include/libavfilter/avfilter.h @@ -94,6 +94,7 @@ typedef struct AVFilterBuffer { /** private data to be used by a custom free function */ void *priv; + /** * A pointer to the function to deallocate this buffer if the default * function is not sufficient. This could, for example, add the memory @@ -234,6 +235,7 @@ void avfilter_unref_buffer(AVFilterBufferRef *ref); */ attribute_deprecated void avfilter_unref_bufferp(AVFilterBufferRef **ref); + #endif /** @@ -243,6 +245,7 @@ attribute_deprecated int avfilter_ref_get_channels(AVFilterBufferRef *ref); #if FF_API_AVFILTERPAD_PUBLIC + /** * A filter pad used for either input or output. * @@ -393,6 +396,7 @@ struct AVFilterPad { */ int needs_writable; }; + #endif /** @@ -913,7 +917,7 @@ int avfilter_config_links(AVFilterContext *filter); */ attribute_deprecated AVFilterBufferRef * -avfilter_get_video_buffer_ref_from_arrays(uint8_t * const data[4], const int linesize[4], int perms, +avfilter_get_video_buffer_ref_from_arrays(uint8_t *const data[4], const int linesize[4], int perms, int w, int h, enum AVPixelFormat format); /** @@ -979,6 +983,7 @@ void avfilter_register_all(void); /** Uninitialize the filter system. Unregister all filters. */ attribute_deprecated void avfilter_uninit(void); + #endif /** @@ -1004,6 +1009,7 @@ int avfilter_register(AVFilter *filter); const #endif + AVFilter *avfilter_get_by_name(const char *name); /** @@ -1023,6 +1029,7 @@ const AVFilter *avfilter_next(const AVFilter *prev); */ attribute_deprecated AVFilter **av_filter_next(AVFilter **filter); + #endif #if FF_API_AVFILTER_OPEN @@ -1038,6 +1045,7 @@ AVFilter **av_filter_next(AVFilter **filter); */ attribute_deprecated int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name); + #endif @@ -1054,6 +1062,7 @@ int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *in */ attribute_deprecated int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque); + #endif /** @@ -1128,6 +1137,7 @@ int avfilter_copy_frame_props(AVFilterBufferRef *dst, const AVFrame *src); */ attribute_deprecated int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src); + #endif /** @@ -1292,6 +1302,7 @@ AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, const char *nam */ attribute_deprecated int avfilter_graph_add_filter(AVFilterGraph *graphctx, AVFilterContext *filter); + #endif /** diff --git a/app/src/main/cpp/include/libavfilter/buffersrc.h b/app/src/main/cpp/include/libavfilter/buffersrc.h index eb1375b..ea34c04 100644 --- a/app/src/main/cpp/include/libavfilter/buffersrc.h +++ b/app/src/main/cpp/include/libavfilter/buffersrc.h @@ -40,7 +40,7 @@ enum { /** * Do not check for format changes. */ - AV_BUFFERSRC_FLAG_NO_CHECK_FORMAT = 1, + AV_BUFFERSRC_FLAG_NO_CHECK_FORMAT = 1, #if FF_API_AVFILTERBUFFER /** @@ -52,14 +52,14 @@ enum { /** * Immediately push the frame to the output. */ - AV_BUFFERSRC_FLAG_PUSH = 4, + AV_BUFFERSRC_FLAG_PUSH = 4, /** * Keep a reference to the frame. * If the frame if reference-counted, create a new reference; otherwise * copy the frame data. */ - AV_BUFFERSRC_FLAG_KEEP_REF = 8, + AV_BUFFERSRC_FLAG_KEEP_REF = 8, }; diff --git a/app/src/main/cpp/include/libavformat/avformat.h b/app/src/main/cpp/include/libavformat/avformat.h index 9c07cb0..4e7d45b 100644 --- a/app/src/main/cpp/include/libavformat/avformat.h +++ b/app/src/main/cpp/include/libavformat/avformat.h @@ -742,9 +742,9 @@ typedef struct AVIndexEntry { * is known */ #define AVINDEX_KEYFRAME 0x0001 - int flags:2; + int flags: 2; int size - :30; //Yeah, trying to keep the size of this small to reduce memory requirements (it is 24 vs. 32 bytes due to possible 8-byte alignment). + : 30; //Yeah, trying to keep the size of this small to reduce memory requirements (it is 24 vs. 32 bytes due to possible 8-byte alignment). int min_distance; /**< Minimum distance between this and the previous keyframe, used to avoid unneeded searching. */ } AVIndexEntry; diff --git a/app/src/main/cpp/include/libavformat/avio.h b/app/src/main/cpp/include/libavformat/avio.h index 3a0e21a..6f923dc 100644 --- a/app/src/main/cpp/include/libavformat/avio.h +++ b/app/src/main/cpp/include/libavformat/avio.h @@ -283,11 +283,10 @@ int64_t avio_skip(AVIOContext *s, int64_t offset); */ static av_always_inline int64_t avio_tell(AVIOContext -*s) -{ -return -avio_seek(s, -0, SEEK_CUR); + *s) { + return + avio_seek(s, + 0, SEEK_CUR); } /** @@ -308,6 +307,7 @@ int avio_feof(AVIOContext *s); */ attribute_deprecated int url_feof(AVIOContext *s); + #endif /** @warning currently size is limited */ diff --git a/app/src/main/cpp/include/libavutil/attributes.h b/app/src/main/cpp/include/libavutil/attributes.h index db95a2a..ca86288 100644 --- a/app/src/main/cpp/include/libavutil/attributes.h +++ b/app/src/main/cpp/include/libavutil/attributes.h @@ -27,7 +27,7 @@ #define AVUTIL_ATTRIBUTES_H #ifdef __GNUC__ -# define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y) +# define AV_GCC_VERSION_AT_LEAST(x, y) (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y) #else # define AV_GCC_VERSION_AT_LEAST(x, y) 0 #endif diff --git a/app/src/main/cpp/include/libavutil/frame.h b/app/src/main/cpp/include/libavutil/frame.h index c644460..dc2ee77 100644 --- a/app/src/main/cpp/include/libavutil/frame.h +++ b/app/src/main/cpp/include/libavutil/frame.h @@ -49,31 +49,31 @@ enum AVFrameSideDataType { /** * The data is the AVPanScan struct defined in libavcodec. */ - AV_FRAME_DATA_PANSCAN, + AV_FRAME_DATA_PANSCAN, /** * ATSC A53 Part 4 Closed Captions. * A53 CC bitstream is stored as uint8_t in AVFrameSideData.data. * The number of bytes of CC data is AVFrameSideData.size. */ - AV_FRAME_DATA_A53_CC, + AV_FRAME_DATA_A53_CC, /** * Stereoscopic 3d metadata. * The data is the AVStereo3D struct defined in libavutil/stereo3d.h. */ - AV_FRAME_DATA_STEREO3D, + AV_FRAME_DATA_STEREO3D, /** * The data is the AVMatrixEncoding enum defined in libavutil/channel_layout.h. */ - AV_FRAME_DATA_MATRIXENCODING, + AV_FRAME_DATA_MATRIXENCODING, /** * Metadata relevant to a downmix procedure. * The data is the AVDownmixInfo struct defined in libavutil/downmix_info.h. */ - AV_FRAME_DATA_DOWNMIX_INFO, + AV_FRAME_DATA_DOWNMIX_INFO, /** * ReplayGain information in the form of the AVReplayGain struct. */ - AV_FRAME_DATA_REPLAYGAIN, + AV_FRAME_DATA_REPLAYGAIN, /** * This side data contains a 3x3 transformation matrix describing an affine * transformation that needs to be applied to the frame for correct @@ -81,19 +81,19 @@ enum AVFrameSideDataType { * * See libavutil/display.h for a detailed description of the data. */ - AV_FRAME_DATA_DISPLAYMATRIX, + AV_FRAME_DATA_DISPLAYMATRIX, /** * Active Format Description data consisting of a single byte as specified * in ETSI TS 101 154 using AVActiveFormatDescription enum. */ - AV_FRAME_DATA_AFD, + AV_FRAME_DATA_AFD, /** * Motion vectors exported by some codecs (on demand through the export_mvs * flag set in the libavcodec AVCodecContext flags2 option). * The data is the AVMotionVector struct defined in * libavutil/motion_vector.h. */ - AV_FRAME_DATA_MOTION_VECTORS, + AV_FRAME_DATA_MOTION_VECTORS, /** * Recommmends skipping the specified number of samples. This is exported * only if the "skip_manual" AVOption is set in libavcodec. @@ -105,7 +105,7 @@ enum AVFrameSideDataType { * u8 reason for end skip (0=padding silence, 1=convergence) * @endcode */ - AV_FRAME_DATA_SKIP_SAMPLES, + AV_FRAME_DATA_SKIP_SAMPLES, }; enum AVActiveFormatDescription { diff --git a/app/src/main/cpp/include/libavutil/mem.h b/app/src/main/cpp/include/libavutil/mem.h index fc113e4..38bf37c 100644 --- a/app/src/main/cpp/include/libavutil/mem.h +++ b/app/src/main/cpp/include/libavutil/mem.h @@ -90,7 +90,9 @@ void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1); * be allocated. * @see av_malloc() */ -av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t size) { +av_alloc_size(1, 2) + +static inline void *av_malloc_array(size_t nmemb, size_t size) { if (!size || nmemb >= INT_MAX / size) return NULL; return av_malloc(nmemb * size); @@ -162,7 +164,9 @@ int av_reallocp(void *ptr, size_t size); * The situation is undefined according to POSIX and may crash with * some libc implementations. */ -av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size); +av_alloc_size(2, 3) + +void *av_realloc_array(void *ptr, size_t nmemb, size_t size); /** * Allocate or reallocate an array through a pointer to a pointer. @@ -181,7 +185,9 @@ av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size) * The situation is undefined according to POSIX and may crash with * some libc implementations. */ -av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size); +av_alloc_size(2, 3) + +int av_reallocp_array(void *ptr, size_t nmemb, size_t size); /** * Free a memory block which has been allocated with av_malloc(z)() or @@ -224,7 +230,9 @@ void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib; * @see av_mallocz() * @see av_malloc_array() */ -av_alloc_size(1, 2) static inline void *av_mallocz_array(size_t nmemb, size_t size) { +av_alloc_size(1, 2) + +static inline void *av_mallocz_array(size_t nmemb, size_t size) { if (!size || nmemb >= INT_MAX / size) return NULL; return av_mallocz(nmemb * size); diff --git a/app/src/main/cpp/include/libavutil/old_pix_fmts.h b/app/src/main/cpp/include/libavutil/old_pix_fmts.h index 70c4f7d..831d08a 100644 --- a/app/src/main/cpp/include/libavutil/old_pix_fmts.h +++ b/app/src/main/cpp/include/libavutil/old_pix_fmts.h @@ -30,45 +30,45 @@ */ PIX_FMT_NONE = AV_PIX_FMT_NONE, PIX_FMT_YUV420P, ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples) - PIX_FMT_YUYV422, ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr - PIX_FMT_RGB24, ///< packed RGB 8:8:8, 24bpp, RGBRGB... - PIX_FMT_BGR24, ///< packed RGB 8:8:8, 24bpp, BGRBGR... - PIX_FMT_YUV422P, ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples) - PIX_FMT_YUV444P, ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples) - PIX_FMT_YUV410P, ///< planar YUV 4:1:0, 9bpp, (1 Cr & Cb sample per 4x4 Y samples) - PIX_FMT_YUV411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples) - PIX_FMT_GRAY8, ///< Y , 8bpp - PIX_FMT_MONOWHITE, ///< Y , 1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb - PIX_FMT_MONOBLACK, ///< Y , 1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb - PIX_FMT_PAL8, ///< 8 bit with PIX_FMT_RGB32 palette - PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range - PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range - PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range +PIX_FMT_YUYV422, ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr +PIX_FMT_RGB24, ///< packed RGB 8:8:8, 24bpp, RGBRGB... +PIX_FMT_BGR24, ///< packed RGB 8:8:8, 24bpp, BGRBGR... +PIX_FMT_YUV422P, ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples) +PIX_FMT_YUV444P, ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples) +PIX_FMT_YUV410P, ///< planar YUV 4:1:0, 9bpp, (1 Cr & Cb sample per 4x4 Y samples) +PIX_FMT_YUV411P, ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples) +PIX_FMT_GRAY8, ///< Y , 8bpp +PIX_FMT_MONOWHITE, ///< Y , 1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb +PIX_FMT_MONOBLACK, ///< Y , 1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb +PIX_FMT_PAL8, ///< 8 bit with PIX_FMT_RGB32 palette +PIX_FMT_YUVJ420P, ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range +PIX_FMT_YUVJ422P, ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range +PIX_FMT_YUVJ444P, ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range #if FF_API_XVMC PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing PIX_FMT_XVMC_MPEG2_IDCT, #endif /* FF_API_XVMC */ PIX_FMT_UYVY422, ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1 - PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3 - PIX_FMT_BGR8, ///< packed RGB 3:3:2, 8bpp, (msb)2B 3G 3R(lsb) - PIX_FMT_BGR4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits - PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1B 2G 1R(lsb) - PIX_FMT_RGB8, ///< packed RGB 3:3:2, 8bpp, (msb)2R 3G 3B(lsb) - PIX_FMT_RGB4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits - PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1R 2G 1B(lsb) - PIX_FMT_NV12, ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V) - PIX_FMT_NV21, ///< as above, but U and V bytes are swapped +PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3 +PIX_FMT_BGR8, ///< packed RGB 3:3:2, 8bpp, (msb)2B 3G 3R(lsb) +PIX_FMT_BGR4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits +PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1B 2G 1R(lsb) +PIX_FMT_RGB8, ///< packed RGB 3:3:2, 8bpp, (msb)2R 3G 3B(lsb) +PIX_FMT_RGB4, ///< packed RGB 1:2:1 bitstream, 4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits +PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1, 8bpp, (msb)1R 2G 1B(lsb) +PIX_FMT_NV12, ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V) +PIX_FMT_NV21, ///< as above, but U and V bytes are swapped - PIX_FMT_ARGB, ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB... - PIX_FMT_RGBA, ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA... - PIX_FMT_ABGR, ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR... - PIX_FMT_BGRA, ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA... +PIX_FMT_ARGB, ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB... +PIX_FMT_RGBA, ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA... +PIX_FMT_ABGR, ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR... +PIX_FMT_BGRA, ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA... - PIX_FMT_GRAY16BE, ///< Y , 16bpp, big-endian - PIX_FMT_GRAY16LE, ///< Y , 16bpp, little-endian - PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples) - PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range - PIX_FMT_YUVA420P, ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples) +PIX_FMT_GRAY16BE, ///< Y , 16bpp, big-endian +PIX_FMT_GRAY16LE, ///< Y , 16bpp, little-endian +PIX_FMT_YUV440P, ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples) +PIX_FMT_YUVJ440P, ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range +PIX_FMT_YUVA420P, ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples) #if FF_API_VDPAU PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers @@ -77,57 +77,57 @@ PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_re PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers #endif PIX_FMT_RGB48BE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian - PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian +PIX_FMT_RGB48LE, ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian - PIX_FMT_RGB565BE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), big-endian - PIX_FMT_RGB565LE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), little-endian - PIX_FMT_RGB555BE, ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0 - PIX_FMT_RGB555LE, ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0 +PIX_FMT_RGB565BE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), big-endian +PIX_FMT_RGB565LE, ///< packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), little-endian +PIX_FMT_RGB555BE, ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0 +PIX_FMT_RGB555LE, ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0 - PIX_FMT_BGR565BE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), big-endian - PIX_FMT_BGR565LE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), little-endian - PIX_FMT_BGR555BE, ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1 - PIX_FMT_BGR555LE, ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1 +PIX_FMT_BGR565BE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), big-endian +PIX_FMT_BGR565LE, ///< packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), little-endian +PIX_FMT_BGR555BE, ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1 +PIX_FMT_BGR555LE, ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1 - PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers - PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers - PIX_FMT_VAAPI_VLD, ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers +PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers +PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers +PIX_FMT_VAAPI_VLD, ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers - PIX_FMT_YUV420P16LE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian - PIX_FMT_YUV420P16BE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian - PIX_FMT_YUV422P16LE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian - PIX_FMT_YUV422P16BE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian - PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian - PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian +PIX_FMT_YUV420P16LE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian +PIX_FMT_YUV420P16BE, ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian +PIX_FMT_YUV422P16LE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian +PIX_FMT_YUV422P16BE, ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian +PIX_FMT_YUV444P16LE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian +PIX_FMT_YUV444P16BE, ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian #if FF_API_VDPAU PIX_FMT_VDPAU_MPEG4, ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers #endif PIX_FMT_DXVA2_VLD, ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer - PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0 - PIX_FMT_RGB444BE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0 - PIX_FMT_BGR444LE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1 - PIX_FMT_BGR444BE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1 - PIX_FMT_GRAY8A, ///< 8bit gray, 8bit alpha - PIX_FMT_BGR48BE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian - PIX_FMT_BGR48LE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian +PIX_FMT_RGB444LE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0 +PIX_FMT_RGB444BE, ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0 +PIX_FMT_BGR444LE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1 +PIX_FMT_BGR444BE, ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1 +PIX_FMT_GRAY8A, ///< 8bit gray, 8bit alpha +PIX_FMT_BGR48BE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian +PIX_FMT_BGR48LE, ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian //the following 10 formats have the disadvantage of needing 1 format for each bit depth, thus //If you want to support multiple bit depths, then using PIX_FMT_YUV420P16* with the bpp stored separately //is better - PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian - PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian - PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian - PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian - PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian - PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian - PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian - PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian - PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian - PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian - PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian - PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian - PIX_FMT_VDA_VLD, ///< hardware decoding through VDA +PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian +PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian +PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian +PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian +PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian +PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian +PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian +PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian +PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian +PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian +PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian +PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian +PIX_FMT_VDA_VLD, ///< hardware decoding through VDA #ifdef AV_PIX_FMT_ABI_GIT_MASTER PIX_FMT_RGBA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian @@ -136,42 +136,42 @@ PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian #endif PIX_FMT_GBRP, ///< planar GBR 4:4:4 24bpp - PIX_FMT_GBRP9BE, ///< planar GBR 4:4:4 27bpp, big endian - PIX_FMT_GBRP9LE, ///< planar GBR 4:4:4 27bpp, little endian - PIX_FMT_GBRP10BE, ///< planar GBR 4:4:4 30bpp, big endian - PIX_FMT_GBRP10LE, ///< planar GBR 4:4:4 30bpp, little endian - PIX_FMT_GBRP16BE, ///< planar GBR 4:4:4 48bpp, big endian - PIX_FMT_GBRP16LE, ///< planar GBR 4:4:4 48bpp, little endian +PIX_FMT_GBRP9BE, ///< planar GBR 4:4:4 27bpp, big endian +PIX_FMT_GBRP9LE, ///< planar GBR 4:4:4 27bpp, little endian +PIX_FMT_GBRP10BE, ///< planar GBR 4:4:4 30bpp, big endian +PIX_FMT_GBRP10LE, ///< planar GBR 4:4:4 30bpp, little endian +PIX_FMT_GBRP16BE, ///< planar GBR 4:4:4 48bpp, big endian +PIX_FMT_GBRP16LE, ///< planar GBR 4:4:4 48bpp, little endian #ifndef AV_PIX_FMT_ABI_GIT_MASTER PIX_FMT_RGBA64BE = 0x123, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian - PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian - PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian - PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian +PIX_FMT_RGBA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian +PIX_FMT_BGRA64BE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian +PIX_FMT_BGRA64LE, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian #endif PIX_FMT_0RGB = 0x123 + 4, ///< packed RGB 8:8:8, 32bpp, 0RGB0RGB... - PIX_FMT_RGB0, ///< packed RGB 8:8:8, 32bpp, RGB0RGB0... - PIX_FMT_0BGR, ///< packed BGR 8:8:8, 32bpp, 0BGR0BGR... - PIX_FMT_BGR0, ///< packed BGR 8:8:8, 32bpp, BGR0BGR0... - PIX_FMT_YUVA444P, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples) - PIX_FMT_YUVA422P, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples) +PIX_FMT_RGB0, ///< packed RGB 8:8:8, 32bpp, RGB0RGB0... +PIX_FMT_0BGR, ///< packed BGR 8:8:8, 32bpp, 0BGR0BGR... +PIX_FMT_BGR0, ///< packed BGR 8:8:8, 32bpp, BGR0BGR0... +PIX_FMT_YUVA444P, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples) +PIX_FMT_YUVA422P, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples) - PIX_FMT_YUV420P12BE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian - PIX_FMT_YUV420P12LE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian - PIX_FMT_YUV420P14BE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian - PIX_FMT_YUV420P14LE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian - PIX_FMT_YUV422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian - PIX_FMT_YUV422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian - PIX_FMT_YUV422P14BE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian - PIX_FMT_YUV422P14LE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian - PIX_FMT_YUV444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian - PIX_FMT_YUV444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian - PIX_FMT_YUV444P14BE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian - PIX_FMT_YUV444P14LE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian - PIX_FMT_GBRP12BE, ///< planar GBR 4:4:4 36bpp, big endian - PIX_FMT_GBRP12LE, ///< planar GBR 4:4:4 36bpp, little endian - PIX_FMT_GBRP14BE, ///< planar GBR 4:4:4 42bpp, big endian - PIX_FMT_GBRP14LE, ///< planar GBR 4:4:4 42bpp, little endian +PIX_FMT_YUV420P12BE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian +PIX_FMT_YUV420P12LE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian +PIX_FMT_YUV420P14BE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian +PIX_FMT_YUV420P14LE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian +PIX_FMT_YUV422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian +PIX_FMT_YUV422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian +PIX_FMT_YUV422P14BE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian +PIX_FMT_YUV422P14LE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian +PIX_FMT_YUV444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian +PIX_FMT_YUV444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian +PIX_FMT_YUV444P14BE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian +PIX_FMT_YUV444P14LE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian +PIX_FMT_GBRP12BE, ///< planar GBR 4:4:4 36bpp, big endian +PIX_FMT_GBRP12LE, ///< planar GBR 4:4:4 36bpp, little endian +PIX_FMT_GBRP14BE, ///< planar GBR 4:4:4 42bpp, big endian +PIX_FMT_GBRP14LE, ///< planar GBR 4:4:4 42bpp, little endian - PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions +PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions #endif /* AVUTIL_OLD_PIX_FMTS_H */ diff --git a/app/src/main/cpp/include/libavutil/opt.h b/app/src/main/cpp/include/libavutil/opt.h index 18fc9e5..0d215a7 100644 --- a/app/src/main/cpp/include/libavutil/opt.h +++ b/app/src/main/cpp/include/libavutil/opt.h @@ -584,7 +584,7 @@ enum { * Accept to parse a value without a key; the key will then be returned * as NULL. */ - AV_OPT_FLAG_IMPLICIT_KEY = 1, + AV_OPT_FLAG_IMPLICIT_KEY = 1, }; /** diff --git a/app/src/main/cpp/include/libavutil/pixdesc.h b/app/src/main/cpp/include/libavutil/pixdesc.h index 56f0cd5..f84ad71 100644 --- a/app/src/main/cpp/include/libavutil/pixdesc.h +++ b/app/src/main/cpp/include/libavutil/pixdesc.h @@ -31,30 +31,30 @@ typedef struct AVComponentDescriptor { /** * Which of the 4 planes contains the component. */ - uint16_t plane : 2; + uint16_t plane: 2; /** * Number of elements between 2 horizontally consecutive pixels minus 1. * Elements are bits for bitstream formats, bytes otherwise. */ - uint16_t step_minus1 : 3; + uint16_t step_minus1: 3; /** * Number of elements before the component of the first pixel plus 1. * Elements are bits for bitstream formats, bytes otherwise. */ - uint16_t offset_plus1 : 3; + uint16_t offset_plus1: 3; /** * Number of least significant bits that must be shifted away * to get the value. */ - uint16_t shift : 3; + uint16_t shift: 3; /** * Number of bits in the component minus 1. */ - uint16_t depth_minus1 : 4; + uint16_t depth_minus1: 4; } AVComponentDescriptor; /** diff --git a/app/src/main/cpp/include/libavutil/pixfmt.h b/app/src/main/cpp/include/libavutil/pixfmt.h index 9cc6635..20e4b32 100644 --- a/app/src/main/cpp/include/libavutil/pixfmt.h +++ b/app/src/main/cpp/include/libavutil/pixfmt.h @@ -158,7 +158,7 @@ enum AVPixelFormat { * Notice that each 9/10 bits sample is stored in 16 bits with extra padding. * If you want to support multiple bit depths, then using AV_PIX_FMT_YUV420P16* with the bpp stored separately is better. */ - AV_PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian + AV_PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian AV_PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian AV_PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian AV_PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian @@ -191,7 +191,7 @@ enum AVPixelFormat { * FFmpeg supports these formats since May 8 2012 and Jan 28 2012 (commits f9ca1ac7 and 143a5c55) * Libav added them Oct 12 2012 with incompatible values (commit 6d5600e85) */ - AV_PIX_FMT_YUVA422P_LIBAV, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples) + AV_PIX_FMT_YUVA422P_LIBAV, ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples) AV_PIX_FMT_YUVA444P_LIBAV, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples) AV_PIX_FMT_YUVA420P9BE, ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), big-endian @@ -227,7 +227,7 @@ enum AVPixelFormat { * also see Fri Nov 25 01:38:21 2011 +0100 92afb431621c79155fcb7171d26f137eb1bee028 * Libav added them Sun Mar 16 23:05:47 2014 +0100 with incompatible values (commit 1481d24c3a0abf81e1d7a514547bd5305232be30) */ - AV_PIX_FMT_RGBA64BE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian + AV_PIX_FMT_RGBA64BE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian AV_PIX_FMT_RGBA64LE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian AV_PIX_FMT_BGRA64BE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian AV_PIX_FMT_BGRA64LE_LIBAV, ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian diff --git a/app/src/main/cpp/include/libavutil/stereo3d.h b/app/src/main/cpp/include/libavutil/stereo3d.h index e4512fd..1135dc9 100644 --- a/app/src/main/cpp/include/libavutil/stereo3d.h +++ b/app/src/main/cpp/include/libavutil/stereo3d.h @@ -32,7 +32,7 @@ enum AVStereo3DType { /** * Video is not stereoscopic (and metadata has to be there). */ - AV_STEREO3D_2D, + AV_STEREO3D_2D, /** * Views are next to each other. @@ -42,7 +42,7 @@ enum AVStereo3DType { * LLLLRRRR * ... */ - AV_STEREO3D_SIDEBYSIDE, + AV_STEREO3D_SIDEBYSIDE, /** * Views are on top of each other. @@ -52,7 +52,7 @@ enum AVStereo3DType { * RRRRRRRR * RRRRRRRR */ - AV_STEREO3D_TOPBOTTOM, + AV_STEREO3D_TOPBOTTOM, /** * Views are alternated temporally. @@ -63,7 +63,7 @@ enum AVStereo3DType { * LLLLLLLL RRRRRRRR LLLLLLLL * ... ... ... */ - AV_STEREO3D_FRAMESEQUENCE, + AV_STEREO3D_FRAMESEQUENCE, /** * Views are packed in a checkerboard-like structure per pixel. @@ -73,7 +73,7 @@ enum AVStereo3DType { * LRLRLRLR * ... */ - AV_STEREO3D_CHECKERBOARD, + AV_STEREO3D_CHECKERBOARD, /** * Views are next to each other, but when upscaling @@ -84,7 +84,7 @@ enum AVStereo3DType { * LLLLRRRR L L L L R R R R * LLLLRRRR L L L L R R R R */ - AV_STEREO3D_SIDEBYSIDE_QUINCUNX, + AV_STEREO3D_SIDEBYSIDE_QUINCUNX, /** * Views are packed per line, as if interlaced. @@ -94,7 +94,7 @@ enum AVStereo3DType { * LLLLLLLL * ... */ - AV_STEREO3D_LINES, + AV_STEREO3D_LINES, /** * Views are packed per column. @@ -104,7 +104,7 @@ enum AVStereo3DType { * LRLRLRLR * ... */ - AV_STEREO3D_COLUMNS, + AV_STEREO3D_COLUMNS, }; diff --git a/app/src/main/cpp/include/libavutil/threadmessage.h b/app/src/main/cpp/include/libavutil/threadmessage.h index 0578892..a8481d8 100644 --- a/app/src/main/cpp/include/libavutil/threadmessage.h +++ b/app/src/main/cpp/include/libavutil/threadmessage.h @@ -28,7 +28,7 @@ typedef enum AVThreadMessageFlags { * If this flag is set, send and recv operations are non-blocking and * return AVERROR(EAGAIN) immediately if they can not proceed. */ - AV_THREAD_MESSAGE_NONBLOCK = 1, + AV_THREAD_MESSAGE_NONBLOCK = 1, } AVThreadMessageFlags; diff --git a/app/src/main/cpp/include/libyuv/include/libyuv/rotate.h b/app/src/main/cpp/include/libyuv/include/libyuv/rotate.h index 2f0ce38..a156c47 100644 --- a/app/src/main/cpp/include/libyuv/include/libyuv/rotate.h +++ b/app/src/main/cpp/include/libyuv/include/libyuv/rotate.h @@ -26,7 +26,7 @@ typedef enum RotationMode { kRotate270 = 270, // Rotate 270 degrees clockwise. // Deprecated. - kRotateNone = 0, + kRotateNone = 0, kRotateClockwise = 90, kRotateCounterClockwise = 270, } RotationModeEnum; diff --git a/app/src/main/cpp/include/libyuv/include/libyuv/video_common.h b/app/src/main/cpp/include/libyuv/include/libyuv/video_common.h index f9af6c6..4e2fd9f 100644 --- a/app/src/main/cpp/include/libyuv/include/libyuv/video_common.h +++ b/app/src/main/cpp/include/libyuv/include/libyuv/video_common.h @@ -50,7 +50,7 @@ extern "C" { // Auxilliary formats call primary converters. enum FourCC { // 9 Primary YUV formats: 5 planar, 2 biplanar, 2 packed. - FOURCC_I420 = FOURCC('I', '4', '2', '0'), + FOURCC_I420 = FOURCC('I', '4', '2', '0'), FOURCC_I422 = FOURCC('I', '4', '2', '2'), FOURCC_I444 = FOURCC('I', '4', '4', '4'), FOURCC_I411 = FOURCC('I', '4', '1', '1'), @@ -61,11 +61,11 @@ enum FourCC { FOURCC_UYVY = FOURCC('U', 'Y', 'V', 'Y'), // 2 Secondary YUV formats: row biplanar. - FOURCC_M420 = FOURCC('M', '4', '2', '0'), + FOURCC_M420 = FOURCC('M', '4', '2', '0'), FOURCC_Q420 = FOURCC('Q', '4', '2', '0'), // 9 Primary RGB formats: 4 32 bpp, 2 24 bpp, 3 16 bpp. - FOURCC_ARGB = FOURCC('A', 'R', 'G', 'B'), + FOURCC_ARGB = FOURCC('A', 'R', 'G', 'B'), FOURCC_BGRA = FOURCC('B', 'G', 'R', 'A'), FOURCC_ABGR = FOURCC('A', 'B', 'G', 'R'), FOURCC_24BG = FOURCC('2', '4', 'B', 'G'), @@ -76,16 +76,16 @@ enum FourCC { FOURCC_R444 = FOURCC('R', '4', '4', '4'), // argb4444 LE. // 4 Secondary RGB formats: 4 Bayer Patterns. - FOURCC_RGGB = FOURCC('R', 'G', 'G', 'B'), + FOURCC_RGGB = FOURCC('R', 'G', 'G', 'B'), FOURCC_BGGR = FOURCC('B', 'G', 'G', 'R'), FOURCC_GRBG = FOURCC('G', 'R', 'B', 'G'), FOURCC_GBRG = FOURCC('G', 'B', 'R', 'G'), // 1 Primary Compressed YUV format. - FOURCC_MJPG = FOURCC('M', 'J', 'P', 'G'), + FOURCC_MJPG = FOURCC('M', 'J', 'P', 'G'), // 5 Auxiliary YUV variations: 3 with U and V planes are swapped, 1 Alias. - FOURCC_YV12 = FOURCC('Y', 'V', '1', '2'), + FOURCC_YV12 = FOURCC('Y', 'V', '1', '2'), FOURCC_YV16 = FOURCC('Y', 'V', '1', '6'), FOURCC_YV24 = FOURCC('Y', 'V', '2', '4'), FOURCC_YU12 = FOURCC('Y', 'U', '1', '2'), // Linux version of I420. @@ -93,7 +93,7 @@ enum FourCC { FOURCC_J400 = FOURCC('J', '4', '0', '0'), // 14 Auxiliary aliases. CanonicalFourCC() maps these to canonical fourcc. - FOURCC_IYUV = FOURCC('I', 'Y', 'U', 'V'), // Alias for I420. + FOURCC_IYUV = FOURCC('I', 'Y', 'U', 'V'), // Alias for I420. FOURCC_YU16 = FOURCC('Y', 'U', '1', '6'), // Alias for I422. FOURCC_YU24 = FOURCC('Y', 'U', '2', '4'), // Alias for I444. FOURCC_YUYV = FOURCC('Y', 'U', 'Y', 'V'), // Alias for YUY2. @@ -112,15 +112,15 @@ enum FourCC { FOURCC_5551 = FOURCC('5', '5', '5', '1'), // Alias for RGBO. // 1 Auxiliary compressed YUV format set aside for capturer. - FOURCC_H264 = FOURCC('H', '2', '6', '4'), + FOURCC_H264 = FOURCC('H', '2', '6', '4'), // Match any fourcc. - FOURCC_ANY = -1, + FOURCC_ANY = -1, }; enum FourCCBpp { // Canonical fourcc codes used in our code. - FOURCC_BPP_I420 = 12, + FOURCC_BPP_I420 = 12, FOURCC_BPP_I422 = 16, FOURCC_BPP_I444 = 24, FOURCC_BPP_I411 = 12, @@ -168,7 +168,7 @@ enum FourCCBpp { FOURCC_BPP_CM24 = 24, // Match any fourcc. - FOURCC_BPP_ANY = 0, // 0 means unknown. + FOURCC_BPP_ANY = 0, // 0 means unknown. }; // Converts fourcc aliases into canonical ones. diff --git a/app/src/main/cpp/include/vo-aacenc/voAMRWB.h b/app/src/main/cpp/include/vo-aacenc/voAMRWB.h index a82ad21..108fd36 100644 --- a/app/src/main/cpp/include/vo-aacenc/voAMRWB.h +++ b/app/src/main/cpp/include/vo-aacenc/voAMRWB.h @@ -52,12 +52,12 @@ typedef enum { /*One word (2-byte) for sync word (0x6b21)*/ /*One word (2-byte) for frame length N.*/ /*N words (2-byte) containing N bits (bit 0 = 0x007f, bit 1 = 0x0081).*/ - VOAMRWB_ITU = 1, + VOAMRWB_ITU = 1, /*One word (2-byte) for sync word (0x6b21).*/ /*One word (2-byte) to indicate the frame type.*/ /*One word (2-byte) to indicate the mode.*/ /*N words (2-byte) containing N bits (bit 0 = 0xff81, bit 1 = 0x007f).*/ - VOAMRWB_RFC3267 = 2, /* see RFC 3267 */ + VOAMRWB_RFC3267 = 2, /* see RFC 3267 */ VOAMRWB_TMAX = VO_MAX_ENUM_VALUE } VOAMRWBFRAMETYPE; diff --git a/app/src/main/java/.DS_Store b/app/src/main/java/.DS_Store deleted file mode 100644 index 128cf7f..0000000 Binary files a/app/src/main/java/.DS_Store and /dev/null differ diff --git a/app/src/main/java/com/.DS_Store b/app/src/main/java/com/.DS_Store deleted file mode 100644 index 995c5df..0000000 Binary files a/app/src/main/java/com/.DS_Store and /dev/null differ diff --git a/app/src/main/java/com/MAVLink/.DS_Store b/app/src/main/java/com/MAVLink/.DS_Store deleted file mode 100644 index 2da6a49..0000000 Binary files a/app/src/main/java/com/MAVLink/.DS_Store and /dev/null differ diff --git a/app/src/main/java/com/MAVLink/MAVLinkPacket.java b/app/src/main/java/com/MAVLink/MAVLinkPacket.java index 14deabd..c4f2d9e 100644 --- a/app/src/main/java/com/MAVLink/MAVLinkPacket.java +++ b/app/src/main/java/com/MAVLink/MAVLinkPacket.java @@ -3,108 +3,168 @@ * This class was automatically generated by the * java mavlink generator tool. It should not be modified by hand. */ - + package com.MAVLink; -import java.io.Serializable; -import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.Messages.MAVLinkMessage; +import com.MAVLink.Messages.MAVLinkPayload; import com.MAVLink.ardupilotmega.CRC; - -import com.MAVLink.ardupilotmega.*; +import com.MAVLink.ardupilotmega.msg_adap_tuning; +import com.MAVLink.ardupilotmega.msg_ahrs; +import com.MAVLink.ardupilotmega.msg_ahrs2; +import com.MAVLink.ardupilotmega.msg_ahrs3; +import com.MAVLink.ardupilotmega.msg_airspeed_autocal; +import com.MAVLink.ardupilotmega.msg_aoa_ssa; +import com.MAVLink.ardupilotmega.msg_ap_adc; +import com.MAVLink.ardupilotmega.msg_autopilot_version_request; +import com.MAVLink.ardupilotmega.msg_battery2; +import com.MAVLink.ardupilotmega.msg_camera_feedback; +import com.MAVLink.ardupilotmega.msg_camera_status; +import com.MAVLink.ardupilotmega.msg_compassmot_status; +import com.MAVLink.ardupilotmega.msg_data16; +import com.MAVLink.ardupilotmega.msg_data32; +import com.MAVLink.ardupilotmega.msg_data64; +import com.MAVLink.ardupilotmega.msg_data96; +import com.MAVLink.ardupilotmega.msg_deepstall; +import com.MAVLink.ardupilotmega.msg_device_op_read; +import com.MAVLink.ardupilotmega.msg_device_op_read_reply; +import com.MAVLink.ardupilotmega.msg_device_op_write; +import com.MAVLink.ardupilotmega.msg_device_op_write_reply; +import com.MAVLink.ardupilotmega.msg_digicam_configure; +import com.MAVLink.ardupilotmega.msg_digicam_control; +import com.MAVLink.ardupilotmega.msg_efi_status; +import com.MAVLink.ardupilotmega.msg_ekf_status_report; +import com.MAVLink.ardupilotmega.msg_esc_telemetry_1_to_4; +import com.MAVLink.ardupilotmega.msg_esc_telemetry_5_to_8; +import com.MAVLink.ardupilotmega.msg_esc_telemetry_9_to_12; +import com.MAVLink.ardupilotmega.msg_fence_fetch_point; +import com.MAVLink.ardupilotmega.msg_fence_point; +import com.MAVLink.ardupilotmega.msg_gimbal_control; +import com.MAVLink.ardupilotmega.msg_gimbal_report; +import com.MAVLink.ardupilotmega.msg_gimbal_torque_cmd_report; +import com.MAVLink.ardupilotmega.msg_gopro_get_request; +import com.MAVLink.ardupilotmega.msg_gopro_get_response; +import com.MAVLink.ardupilotmega.msg_gopro_heartbeat; +import com.MAVLink.ardupilotmega.msg_gopro_set_request; +import com.MAVLink.ardupilotmega.msg_gopro_set_response; +import com.MAVLink.ardupilotmega.msg_hwstatus; +import com.MAVLink.ardupilotmega.msg_led_control; +import com.MAVLink.ardupilotmega.msg_limits_status; +import com.MAVLink.ardupilotmega.msg_mag_cal_progress; +import com.MAVLink.ardupilotmega.msg_mag_cal_report; +import com.MAVLink.ardupilotmega.msg_meminfo; +import com.MAVLink.ardupilotmega.msg_mount_configure; +import com.MAVLink.ardupilotmega.msg_mount_control; +import com.MAVLink.ardupilotmega.msg_mount_status; +import com.MAVLink.ardupilotmega.msg_pid_tuning; +import com.MAVLink.ardupilotmega.msg_radio; +import com.MAVLink.ardupilotmega.msg_rally_fetch_point; +import com.MAVLink.ardupilotmega.msg_rally_point; +import com.MAVLink.ardupilotmega.msg_rangefinder; +import com.MAVLink.ardupilotmega.msg_remote_log_block_status; +import com.MAVLink.ardupilotmega.msg_remote_log_data_block; +import com.MAVLink.ardupilotmega.msg_rpm; +import com.MAVLink.ardupilotmega.msg_sensor_offsets; +import com.MAVLink.ardupilotmega.msg_set_mag_offsets; +import com.MAVLink.ardupilotmega.msg_simstate; +import com.MAVLink.ardupilotmega.msg_vision_position_delta; +import com.MAVLink.ardupilotmega.msg_wind; import com.MAVLink.common.*; -import com.MAVLink.uAvionix.*; -import com.MAVLink.icarous.*; +import com.MAVLink.icarous.msg_icarous_heartbeat; +import com.MAVLink.icarous.msg_icarous_kinematic_bands; +import com.MAVLink.uAvionix.msg_uavionix_adsb_out_cfg; +import com.MAVLink.uAvionix.msg_uavionix_adsb_out_dynamic; +import com.MAVLink.uAvionix.msg_uavionix_adsb_transceiver_health_report; + +import java.io.Serializable; /** -* Common interface for all MAVLink Messages -* Packet Anatomy -* This is the anatomy of one packet. It is inspired by the CAN and SAE AS-4 standards. - -* Byte Index Content Value Explanation -* 0 Packet start sign v1.0: 0xFE Indicates the start of a new packet. (v0.9: 0x55) -* 1 Payload length 0 - 255 Indicates length of the following payload. -* 2 Packet sequence 0 - 255 Each component counts up his send sequence. Allows to detect packet loss -* 3 System ID 1 - 255 ID of the SENDING system. Allows to differentiate different MAVs on the same network. -* 4 Component ID 0 - 255 ID of the SENDING component. Allows to differentiate different components of the same system, e.g. the IMU and the autopilot. -* 5 Message ID 0 - 255 ID of the message - the id defines what the payload means and how it should be correctly decoded. -* 6 to (n+6) Payload 0 - 255 Data of the message, depends on the message id. -* (n+7)to(n+8) Checksum (low byte, high byte) ITU X.25/SAE AS-4 hash, excluding packet start sign, so bytes 1..(n+6) Note: The checksum also includes MAVLINK_CRC_EXTRA (Number computed from message fields. Protects the packet from decoding a different version of the same packet but with different variables). - -* The checksum is the same as used in ITU X.25 and SAE AS-4 standards (CRC-16-CCITT), documented in SAE AS5669A. Please see the MAVLink source code for a documented C-implementation of it. LINK TO CHECKSUM -* The minimum packet length is 8 bytes for acknowledgement packets without payload -* The maximum packet length is 263 bytes for full payload -* -*/ + * Common interface for all MAVLink Messages + * Packet Anatomy + * This is the anatomy of one packet. It is inspired by the CAN and SAE AS-4 standards. + *

+ * Byte Index Content Value Explanation + * 0 Packet start sign v1.0: 0xFE Indicates the start of a new packet. (v0.9: 0x55) + * 1 Payload length 0 - 255 Indicates length of the following payload. + * 2 Packet sequence 0 - 255 Each component counts up his send sequence. Allows to detect packet loss + * 3 System ID 1 - 255 ID of the SENDING system. Allows to differentiate different MAVs on the same network. + * 4 Component ID 0 - 255 ID of the SENDING component. Allows to differentiate different components of the same system, e.g. the IMU and the autopilot. + * 5 Message ID 0 - 255 ID of the message - the id defines what the payload means and how it should be correctly decoded. + * 6 to (n+6) Payload 0 - 255 Data of the message, depends on the message id. + * (n+7)to(n+8) Checksum (low byte, high byte) ITU X.25/SAE AS-4 hash, excluding packet start sign, so bytes 1..(n+6) Note: The checksum also includes MAVLINK_CRC_EXTRA (Number computed from message fields. Protects the packet from decoding a different version of the same packet but with different variables). + *

+ * The checksum is the same as used in ITU X.25 and SAE AS-4 standards (CRC-16-CCITT), documented in SAE AS5669A. Please see the MAVLink source code for a documented C-implementation of it. LINK TO CHECKSUM + * The minimum packet length is 8 bytes for acknowledgement packets without payload + * The maximum packet length is 263 bytes for full payload + */ public class MAVLinkPacket implements Serializable { private static final long serialVersionUID = 2095947771227815314L; public static final int MAVLINK_STX = 254; /** - * Message length. NOT counting STX, LENGTH, SEQ, SYSID, COMPID, MSGID, CRC1 and CRC2 - */ + * Message length. NOT counting STX, LENGTH, SEQ, SYSID, COMPID, MSGID, CRC1 and CRC2 + */ public final int len; /** - * Message sequence - */ + * Message sequence + */ public int seq; /** - * ID of the SENDING system. Allows to differentiate different MAVs on the - * same network. - */ + * ID of the SENDING system. Allows to differentiate different MAVs on the + * same network. + */ public int sysid; /** - * ID of the SENDING component. Allows to differentiate different components - * of the same system, e.g. the IMU and the autopilot. - */ + * ID of the SENDING component. Allows to differentiate different components + * of the same system, e.g. the IMU and the autopilot. + */ public int compid; /** - * ID of the message - the id defines what the payload means and how it - * should be correctly decoded. - */ + * ID of the message - the id defines what the payload means and how it + * should be correctly decoded. + */ public int msgid; /** - * Data of the message, depends on the message id. - */ + * Data of the message, depends on the message id. + */ public MAVLinkPayload payload; /** - * ITU X.25/SAE AS-4 hash, excluding packet start sign, so bytes 1..(n+6) - * Note: The checksum also includes MAVLINK_CRC_EXTRA (Number computed from - * message fields. Protects the packet from decoding a different version of - * the same packet but with different variables). - */ + * ITU X.25/SAE AS-4 hash, excluding packet start sign, so bytes 1..(n+6) + * Note: The checksum also includes MAVLINK_CRC_EXTRA (Number computed from + * message fields. Protects the packet from decoding a different version of + * the same packet but with different variables). + */ public CRC crc; - public MAVLinkPacket(int payloadLength){ + public MAVLinkPacket(int payloadLength) { len = payloadLength; payload = new MAVLinkPayload(payloadLength); } /** - * Check if the size of the Payload is equal to the "len" byte - */ + * Check if the size of the Payload is equal to the "len" byte + */ public boolean payloadIsFilled() { return payload.size() >= len; } /** - * Update CRC for this packet. - */ - public void generateCRC(){ - if(crc == null){ + * Update CRC for this packet. + */ + public void generateCRC() { + if (crc == null) { crc = new CRC(); - } - else{ + } else { crc.start_checksum(); } - + crc.update_checksum(len); crc.update_checksum(seq); crc.update_checksum(sysid); @@ -121,13 +181,13 @@ public class MAVLinkPacket implements Serializable { } /** - * Encode this packet for transmission. - * - * @return Array with bytes to be transmitted - */ + * Encode this packet for transmission. + * + * @return Array with bytes to be transmitted + */ public byte[] encodePacket() { byte[] buffer = new byte[6 + len + 2]; - + int i = 0; buffer[i++] = (byte) MAVLINK_STX; buffer[i++] = (byte) len; @@ -148,785 +208,785 @@ public class MAVLinkPacket implements Serializable { } /** - * Unpack the data in this packet and return a MAVLink message - * - * @return MAVLink message decoded from this packet - */ + * Unpack the data in this packet and return a MAVLink message + * + * @return MAVLink message decoded from this packet + */ public MAVLinkMessage unpack() { switch (msgid) { - + case msg_sensor_offsets.MAVLINK_MSG_ID_SENSOR_OFFSETS: - return new msg_sensor_offsets(this); - + return new msg_sensor_offsets(this); + case msg_set_mag_offsets.MAVLINK_MSG_ID_SET_MAG_OFFSETS: - return new msg_set_mag_offsets(this); - + return new msg_set_mag_offsets(this); + case msg_meminfo.MAVLINK_MSG_ID_MEMINFO: - return new msg_meminfo(this); - + return new msg_meminfo(this); + case msg_ap_adc.MAVLINK_MSG_ID_AP_ADC: - return new msg_ap_adc(this); - + return new msg_ap_adc(this); + case msg_digicam_configure.MAVLINK_MSG_ID_DIGICAM_CONFIGURE: - return new msg_digicam_configure(this); - + return new msg_digicam_configure(this); + case msg_digicam_control.MAVLINK_MSG_ID_DIGICAM_CONTROL: - return new msg_digicam_control(this); - + return new msg_digicam_control(this); + case msg_mount_configure.MAVLINK_MSG_ID_MOUNT_CONFIGURE: - return new msg_mount_configure(this); - + return new msg_mount_configure(this); + case msg_mount_control.MAVLINK_MSG_ID_MOUNT_CONTROL: - return new msg_mount_control(this); - + return new msg_mount_control(this); + case msg_mount_status.MAVLINK_MSG_ID_MOUNT_STATUS: - return new msg_mount_status(this); - + return new msg_mount_status(this); + case msg_fence_point.MAVLINK_MSG_ID_FENCE_POINT: - return new msg_fence_point(this); - + return new msg_fence_point(this); + case msg_fence_fetch_point.MAVLINK_MSG_ID_FENCE_FETCH_POINT: - return new msg_fence_fetch_point(this); - + return new msg_fence_fetch_point(this); + case msg_ahrs.MAVLINK_MSG_ID_AHRS: - return new msg_ahrs(this); - + return new msg_ahrs(this); + case msg_simstate.MAVLINK_MSG_ID_SIMSTATE: - return new msg_simstate(this); - + return new msg_simstate(this); + case msg_hwstatus.MAVLINK_MSG_ID_HWSTATUS: - return new msg_hwstatus(this); - + return new msg_hwstatus(this); + case msg_radio.MAVLINK_MSG_ID_RADIO: - return new msg_radio(this); - + return new msg_radio(this); + case msg_limits_status.MAVLINK_MSG_ID_LIMITS_STATUS: - return new msg_limits_status(this); - + return new msg_limits_status(this); + case msg_wind.MAVLINK_MSG_ID_WIND: - return new msg_wind(this); - + return new msg_wind(this); + case msg_data16.MAVLINK_MSG_ID_DATA16: - return new msg_data16(this); - + return new msg_data16(this); + case msg_data32.MAVLINK_MSG_ID_DATA32: - return new msg_data32(this); - + return new msg_data32(this); + case msg_data64.MAVLINK_MSG_ID_DATA64: - return new msg_data64(this); - + return new msg_data64(this); + case msg_data96.MAVLINK_MSG_ID_DATA96: - return new msg_data96(this); - + return new msg_data96(this); + case msg_rangefinder.MAVLINK_MSG_ID_RANGEFINDER: - return new msg_rangefinder(this); - + return new msg_rangefinder(this); + case msg_airspeed_autocal.MAVLINK_MSG_ID_AIRSPEED_AUTOCAL: - return new msg_airspeed_autocal(this); - + return new msg_airspeed_autocal(this); + case msg_rally_point.MAVLINK_MSG_ID_RALLY_POINT: - return new msg_rally_point(this); - + return new msg_rally_point(this); + case msg_rally_fetch_point.MAVLINK_MSG_ID_RALLY_FETCH_POINT: - return new msg_rally_fetch_point(this); - + return new msg_rally_fetch_point(this); + case msg_compassmot_status.MAVLINK_MSG_ID_COMPASSMOT_STATUS: - return new msg_compassmot_status(this); - + return new msg_compassmot_status(this); + case msg_ahrs2.MAVLINK_MSG_ID_AHRS2: - return new msg_ahrs2(this); - + return new msg_ahrs2(this); + case msg_camera_status.MAVLINK_MSG_ID_CAMERA_STATUS: - return new msg_camera_status(this); - + return new msg_camera_status(this); + case msg_camera_feedback.MAVLINK_MSG_ID_CAMERA_FEEDBACK: - return new msg_camera_feedback(this); - + return new msg_camera_feedback(this); + case msg_battery2.MAVLINK_MSG_ID_BATTERY2: - return new msg_battery2(this); - + return new msg_battery2(this); + case msg_ahrs3.MAVLINK_MSG_ID_AHRS3: - return new msg_ahrs3(this); - + return new msg_ahrs3(this); + case msg_autopilot_version_request.MAVLINK_MSG_ID_AUTOPILOT_VERSION_REQUEST: - return new msg_autopilot_version_request(this); - + return new msg_autopilot_version_request(this); + case msg_remote_log_data_block.MAVLINK_MSG_ID_REMOTE_LOG_DATA_BLOCK: - return new msg_remote_log_data_block(this); - + return new msg_remote_log_data_block(this); + case msg_remote_log_block_status.MAVLINK_MSG_ID_REMOTE_LOG_BLOCK_STATUS: - return new msg_remote_log_block_status(this); - + return new msg_remote_log_block_status(this); + case msg_led_control.MAVLINK_MSG_ID_LED_CONTROL: - return new msg_led_control(this); - + return new msg_led_control(this); + case msg_mag_cal_progress.MAVLINK_MSG_ID_MAG_CAL_PROGRESS: - return new msg_mag_cal_progress(this); - + return new msg_mag_cal_progress(this); + case msg_mag_cal_report.MAVLINK_MSG_ID_MAG_CAL_REPORT: - return new msg_mag_cal_report(this); - + return new msg_mag_cal_report(this); + case msg_ekf_status_report.MAVLINK_MSG_ID_EKF_STATUS_REPORT: - return new msg_ekf_status_report(this); - + return new msg_ekf_status_report(this); + case msg_pid_tuning.MAVLINK_MSG_ID_PID_TUNING: - return new msg_pid_tuning(this); - + return new msg_pid_tuning(this); + case msg_deepstall.MAVLINK_MSG_ID_DEEPSTALL: - return new msg_deepstall(this); - + return new msg_deepstall(this); + case msg_gimbal_report.MAVLINK_MSG_ID_GIMBAL_REPORT: - return new msg_gimbal_report(this); - + return new msg_gimbal_report(this); + case msg_gimbal_control.MAVLINK_MSG_ID_GIMBAL_CONTROL: - return new msg_gimbal_control(this); - + return new msg_gimbal_control(this); + case msg_gimbal_torque_cmd_report.MAVLINK_MSG_ID_GIMBAL_TORQUE_CMD_REPORT: - return new msg_gimbal_torque_cmd_report(this); - + return new msg_gimbal_torque_cmd_report(this); + case msg_gopro_heartbeat.MAVLINK_MSG_ID_GOPRO_HEARTBEAT: - return new msg_gopro_heartbeat(this); - + return new msg_gopro_heartbeat(this); + case msg_gopro_get_request.MAVLINK_MSG_ID_GOPRO_GET_REQUEST: - return new msg_gopro_get_request(this); - + return new msg_gopro_get_request(this); + case msg_gopro_get_response.MAVLINK_MSG_ID_GOPRO_GET_RESPONSE: - return new msg_gopro_get_response(this); - + return new msg_gopro_get_response(this); + case msg_gopro_set_request.MAVLINK_MSG_ID_GOPRO_SET_REQUEST: - return new msg_gopro_set_request(this); - + return new msg_gopro_set_request(this); + case msg_gopro_set_response.MAVLINK_MSG_ID_GOPRO_SET_RESPONSE: - return new msg_gopro_set_response(this); - + return new msg_gopro_set_response(this); + case msg_efi_status.MAVLINK_MSG_ID_EFI_STATUS: - return new msg_efi_status(this); - + return new msg_efi_status(this); + case msg_rpm.MAVLINK_MSG_ID_RPM: - return new msg_rpm(this); - + return new msg_rpm(this); + case msg_device_op_read.MAVLINK_MSG_ID_DEVICE_OP_READ: - return new msg_device_op_read(this); - + return new msg_device_op_read(this); + case msg_device_op_read_reply.MAVLINK_MSG_ID_DEVICE_OP_READ_REPLY: - return new msg_device_op_read_reply(this); - + return new msg_device_op_read_reply(this); + case msg_device_op_write.MAVLINK_MSG_ID_DEVICE_OP_WRITE: - return new msg_device_op_write(this); - + return new msg_device_op_write(this); + case msg_device_op_write_reply.MAVLINK_MSG_ID_DEVICE_OP_WRITE_REPLY: - return new msg_device_op_write_reply(this); - + return new msg_device_op_write_reply(this); + case msg_adap_tuning.MAVLINK_MSG_ID_ADAP_TUNING: - return new msg_adap_tuning(this); - + return new msg_adap_tuning(this); + case msg_vision_position_delta.MAVLINK_MSG_ID_VISION_POSITION_DELTA: - return new msg_vision_position_delta(this); - + return new msg_vision_position_delta(this); + case msg_aoa_ssa.MAVLINK_MSG_ID_AOA_SSA: - return new msg_aoa_ssa(this); - + return new msg_aoa_ssa(this); + case msg_esc_telemetry_1_to_4.MAVLINK_MSG_ID_ESC_TELEMETRY_1_TO_4: - return new msg_esc_telemetry_1_to_4(this); - + return new msg_esc_telemetry_1_to_4(this); + case msg_esc_telemetry_5_to_8.MAVLINK_MSG_ID_ESC_TELEMETRY_5_TO_8: - return new msg_esc_telemetry_5_to_8(this); - + return new msg_esc_telemetry_5_to_8(this); + case msg_esc_telemetry_9_to_12.MAVLINK_MSG_ID_ESC_TELEMETRY_9_TO_12: - return new msg_esc_telemetry_9_to_12(this); - - + return new msg_esc_telemetry_9_to_12(this); + + case msg_heartbeat.MAVLINK_MSG_ID_HEARTBEAT: - return new msg_heartbeat(this); - + return new msg_heartbeat(this); + case msg_sys_status.MAVLINK_MSG_ID_SYS_STATUS: - return new msg_sys_status(this); - + return new msg_sys_status(this); + case msg_system_time.MAVLINK_MSG_ID_SYSTEM_TIME: - return new msg_system_time(this); - + return new msg_system_time(this); + case msg_ping.MAVLINK_MSG_ID_PING: - return new msg_ping(this); - + return new msg_ping(this); + case msg_change_operator_control.MAVLINK_MSG_ID_CHANGE_OPERATOR_CONTROL: - return new msg_change_operator_control(this); - + return new msg_change_operator_control(this); + case msg_change_operator_control_ack.MAVLINK_MSG_ID_CHANGE_OPERATOR_CONTROL_ACK: - return new msg_change_operator_control_ack(this); - + return new msg_change_operator_control_ack(this); + case msg_auth_key.MAVLINK_MSG_ID_AUTH_KEY: - return new msg_auth_key(this); - + return new msg_auth_key(this); + case msg_link_node_status.MAVLINK_MSG_ID_LINK_NODE_STATUS: - return new msg_link_node_status(this); - + return new msg_link_node_status(this); + case msg_set_mode.MAVLINK_MSG_ID_SET_MODE: - return new msg_set_mode(this); - + return new msg_set_mode(this); + case msg_param_request_read.MAVLINK_MSG_ID_PARAM_REQUEST_READ: - return new msg_param_request_read(this); - + return new msg_param_request_read(this); + case msg_param_request_list.MAVLINK_MSG_ID_PARAM_REQUEST_LIST: - return new msg_param_request_list(this); - + return new msg_param_request_list(this); + case msg_param_value.MAVLINK_MSG_ID_PARAM_VALUE: - return new msg_param_value(this); - + return new msg_param_value(this); + case msg_param_set.MAVLINK_MSG_ID_PARAM_SET: - return new msg_param_set(this); - + return new msg_param_set(this); + case msg_gps_raw_int.MAVLINK_MSG_ID_GPS_RAW_INT: - return new msg_gps_raw_int(this); - + return new msg_gps_raw_int(this); + case msg_gps_status.MAVLINK_MSG_ID_GPS_STATUS: - return new msg_gps_status(this); - + return new msg_gps_status(this); + case msg_scaled_imu.MAVLINK_MSG_ID_SCALED_IMU: - return new msg_scaled_imu(this); - + return new msg_scaled_imu(this); + case msg_raw_imu.MAVLINK_MSG_ID_RAW_IMU: - return new msg_raw_imu(this); - + return new msg_raw_imu(this); + case msg_raw_pressure.MAVLINK_MSG_ID_RAW_PRESSURE: - return new msg_raw_pressure(this); - + return new msg_raw_pressure(this); + case msg_scaled_pressure.MAVLINK_MSG_ID_SCALED_PRESSURE: - return new msg_scaled_pressure(this); - + return new msg_scaled_pressure(this); + case msg_attitude.MAVLINK_MSG_ID_ATTITUDE: - return new msg_attitude(this); - + return new msg_attitude(this); + case msg_attitude_quaternion.MAVLINK_MSG_ID_ATTITUDE_QUATERNION: - return new msg_attitude_quaternion(this); - + return new msg_attitude_quaternion(this); + case msg_local_position_ned.MAVLINK_MSG_ID_LOCAL_POSITION_NED: - return new msg_local_position_ned(this); - + return new msg_local_position_ned(this); + case msg_global_position_int.MAVLINK_MSG_ID_GLOBAL_POSITION_INT: - return new msg_global_position_int(this); - + return new msg_global_position_int(this); + case msg_rc_channels_scaled.MAVLINK_MSG_ID_RC_CHANNELS_SCALED: - return new msg_rc_channels_scaled(this); - + return new msg_rc_channels_scaled(this); + case msg_rc_channels_raw.MAVLINK_MSG_ID_RC_CHANNELS_RAW: - return new msg_rc_channels_raw(this); - + return new msg_rc_channels_raw(this); + case msg_servo_output_raw.MAVLINK_MSG_ID_SERVO_OUTPUT_RAW: - return new msg_servo_output_raw(this); - + return new msg_servo_output_raw(this); + case msg_mission_request_partial_list.MAVLINK_MSG_ID_MISSION_REQUEST_PARTIAL_LIST: - return new msg_mission_request_partial_list(this); - + return new msg_mission_request_partial_list(this); + case msg_mission_write_partial_list.MAVLINK_MSG_ID_MISSION_WRITE_PARTIAL_LIST: - return new msg_mission_write_partial_list(this); - + return new msg_mission_write_partial_list(this); + case msg_mission_item.MAVLINK_MSG_ID_MISSION_ITEM: - return new msg_mission_item(this); - + return new msg_mission_item(this); + case msg_mission_request.MAVLINK_MSG_ID_MISSION_REQUEST: - return new msg_mission_request(this); - + return new msg_mission_request(this); + case msg_mission_set_current.MAVLINK_MSG_ID_MISSION_SET_CURRENT: - return new msg_mission_set_current(this); - + return new msg_mission_set_current(this); + case msg_mission_current.MAVLINK_MSG_ID_MISSION_CURRENT: - return new msg_mission_current(this); - + return new msg_mission_current(this); + case msg_mission_request_list.MAVLINK_MSG_ID_MISSION_REQUEST_LIST: - return new msg_mission_request_list(this); - + return new msg_mission_request_list(this); + case msg_mission_count.MAVLINK_MSG_ID_MISSION_COUNT: - return new msg_mission_count(this); - + return new msg_mission_count(this); + case msg_mission_clear_all.MAVLINK_MSG_ID_MISSION_CLEAR_ALL: - return new msg_mission_clear_all(this); - + return new msg_mission_clear_all(this); + case msg_mission_item_reached.MAVLINK_MSG_ID_MISSION_ITEM_REACHED: - return new msg_mission_item_reached(this); - + return new msg_mission_item_reached(this); + case msg_mission_ack.MAVLINK_MSG_ID_MISSION_ACK: - return new msg_mission_ack(this); - + return new msg_mission_ack(this); + case msg_set_gps_global_origin.MAVLINK_MSG_ID_SET_GPS_GLOBAL_ORIGIN: - return new msg_set_gps_global_origin(this); - + return new msg_set_gps_global_origin(this); + case msg_gps_global_origin.MAVLINK_MSG_ID_GPS_GLOBAL_ORIGIN: - return new msg_gps_global_origin(this); - + return new msg_gps_global_origin(this); + case msg_param_map_rc.MAVLINK_MSG_ID_PARAM_MAP_RC: - return new msg_param_map_rc(this); - + return new msg_param_map_rc(this); + case msg_mission_request_int.MAVLINK_MSG_ID_MISSION_REQUEST_INT: - return new msg_mission_request_int(this); - + return new msg_mission_request_int(this); + case msg_mission_changed.MAVLINK_MSG_ID_MISSION_CHANGED: - return new msg_mission_changed(this); - + return new msg_mission_changed(this); + case msg_safety_set_allowed_area.MAVLINK_MSG_ID_SAFETY_SET_ALLOWED_AREA: - return new msg_safety_set_allowed_area(this); - + return new msg_safety_set_allowed_area(this); + case msg_safety_allowed_area.MAVLINK_MSG_ID_SAFETY_ALLOWED_AREA: - return new msg_safety_allowed_area(this); - + return new msg_safety_allowed_area(this); + case msg_attitude_quaternion_cov.MAVLINK_MSG_ID_ATTITUDE_QUATERNION_COV: - return new msg_attitude_quaternion_cov(this); - + return new msg_attitude_quaternion_cov(this); + case msg_nav_controller_output.MAVLINK_MSG_ID_NAV_CONTROLLER_OUTPUT: - return new msg_nav_controller_output(this); - + return new msg_nav_controller_output(this); + case msg_global_position_int_cov.MAVLINK_MSG_ID_GLOBAL_POSITION_INT_COV: - return new msg_global_position_int_cov(this); - + return new msg_global_position_int_cov(this); + case msg_local_position_ned_cov.MAVLINK_MSG_ID_LOCAL_POSITION_NED_COV: - return new msg_local_position_ned_cov(this); - + return new msg_local_position_ned_cov(this); + case msg_rc_channels.MAVLINK_MSG_ID_RC_CHANNELS: - return new msg_rc_channels(this); - + return new msg_rc_channels(this); + case msg_request_data_stream.MAVLINK_MSG_ID_REQUEST_DATA_STREAM: - return new msg_request_data_stream(this); - + return new msg_request_data_stream(this); + case msg_data_stream.MAVLINK_MSG_ID_DATA_STREAM: - return new msg_data_stream(this); - + return new msg_data_stream(this); + case msg_manual_control.MAVLINK_MSG_ID_MANUAL_CONTROL: - return new msg_manual_control(this); - + return new msg_manual_control(this); + case msg_rc_channels_override.MAVLINK_MSG_ID_RC_CHANNELS_OVERRIDE: - return new msg_rc_channels_override(this); - + return new msg_rc_channels_override(this); + case msg_mission_item_int.MAVLINK_MSG_ID_MISSION_ITEM_INT: - return new msg_mission_item_int(this); - + return new msg_mission_item_int(this); + case msg_vfr_hud.MAVLINK_MSG_ID_VFR_HUD: - return new msg_vfr_hud(this); - + return new msg_vfr_hud(this); + case msg_command_int.MAVLINK_MSG_ID_COMMAND_INT: - return new msg_command_int(this); - + return new msg_command_int(this); + case msg_command_long.MAVLINK_MSG_ID_COMMAND_LONG: - return new msg_command_long(this); - + return new msg_command_long(this); + case msg_command_ack.MAVLINK_MSG_ID_COMMAND_ACK: - return new msg_command_ack(this); - + return new msg_command_ack(this); + case msg_manual_setpoint.MAVLINK_MSG_ID_MANUAL_SETPOINT: - return new msg_manual_setpoint(this); - + return new msg_manual_setpoint(this); + case msg_set_attitude_target.MAVLINK_MSG_ID_SET_ATTITUDE_TARGET: - return new msg_set_attitude_target(this); - + return new msg_set_attitude_target(this); + case msg_attitude_target.MAVLINK_MSG_ID_ATTITUDE_TARGET: - return new msg_attitude_target(this); - + return new msg_attitude_target(this); + case msg_set_position_target_local_ned.MAVLINK_MSG_ID_SET_POSITION_TARGET_LOCAL_NED: - return new msg_set_position_target_local_ned(this); - + return new msg_set_position_target_local_ned(this); + case msg_position_target_local_ned.MAVLINK_MSG_ID_POSITION_TARGET_LOCAL_NED: - return new msg_position_target_local_ned(this); - + return new msg_position_target_local_ned(this); + case msg_set_position_target_global_int.MAVLINK_MSG_ID_SET_POSITION_TARGET_GLOBAL_INT: - return new msg_set_position_target_global_int(this); - + return new msg_set_position_target_global_int(this); + case msg_position_target_global_int.MAVLINK_MSG_ID_POSITION_TARGET_GLOBAL_INT: - return new msg_position_target_global_int(this); - + return new msg_position_target_global_int(this); + case msg_local_position_ned_system_global_offset.MAVLINK_MSG_ID_LOCAL_POSITION_NED_SYSTEM_GLOBAL_OFFSET: - return new msg_local_position_ned_system_global_offset(this); - + return new msg_local_position_ned_system_global_offset(this); + case msg_hil_state.MAVLINK_MSG_ID_HIL_STATE: - return new msg_hil_state(this); - + return new msg_hil_state(this); + case msg_hil_controls.MAVLINK_MSG_ID_HIL_CONTROLS: - return new msg_hil_controls(this); - + return new msg_hil_controls(this); + case msg_hil_rc_inputs_raw.MAVLINK_MSG_ID_HIL_RC_INPUTS_RAW: - return new msg_hil_rc_inputs_raw(this); - + return new msg_hil_rc_inputs_raw(this); + case msg_hil_actuator_controls.MAVLINK_MSG_ID_HIL_ACTUATOR_CONTROLS: - return new msg_hil_actuator_controls(this); - + return new msg_hil_actuator_controls(this); + case msg_optical_flow.MAVLINK_MSG_ID_OPTICAL_FLOW: - return new msg_optical_flow(this); - + return new msg_optical_flow(this); + case msg_global_vision_position_estimate.MAVLINK_MSG_ID_GLOBAL_VISION_POSITION_ESTIMATE: - return new msg_global_vision_position_estimate(this); - + return new msg_global_vision_position_estimate(this); + case msg_vision_position_estimate.MAVLINK_MSG_ID_VISION_POSITION_ESTIMATE: - return new msg_vision_position_estimate(this); - + return new msg_vision_position_estimate(this); + case msg_vision_speed_estimate.MAVLINK_MSG_ID_VISION_SPEED_ESTIMATE: - return new msg_vision_speed_estimate(this); - + return new msg_vision_speed_estimate(this); + case msg_vicon_position_estimate.MAVLINK_MSG_ID_VICON_POSITION_ESTIMATE: - return new msg_vicon_position_estimate(this); - + return new msg_vicon_position_estimate(this); + case msg_highres_imu.MAVLINK_MSG_ID_HIGHRES_IMU: - return new msg_highres_imu(this); - + return new msg_highres_imu(this); + case msg_optical_flow_rad.MAVLINK_MSG_ID_OPTICAL_FLOW_RAD: - return new msg_optical_flow_rad(this); - + return new msg_optical_flow_rad(this); + case msg_hil_sensor.MAVLINK_MSG_ID_HIL_SENSOR: - return new msg_hil_sensor(this); - + return new msg_hil_sensor(this); + case msg_sim_state.MAVLINK_MSG_ID_SIM_STATE: - return new msg_sim_state(this); - + return new msg_sim_state(this); + case msg_radio_status.MAVLINK_MSG_ID_RADIO_STATUS: - return new msg_radio_status(this); - + return new msg_radio_status(this); + case msg_file_transfer_protocol.MAVLINK_MSG_ID_FILE_TRANSFER_PROTOCOL: - return new msg_file_transfer_protocol(this); - + return new msg_file_transfer_protocol(this); + case msg_timesync.MAVLINK_MSG_ID_TIMESYNC: - return new msg_timesync(this); - + return new msg_timesync(this); + case msg_camera_trigger.MAVLINK_MSG_ID_CAMERA_TRIGGER: - return new msg_camera_trigger(this); - + return new msg_camera_trigger(this); + case msg_hil_gps.MAVLINK_MSG_ID_HIL_GPS: - return new msg_hil_gps(this); - + return new msg_hil_gps(this); + case msg_hil_optical_flow.MAVLINK_MSG_ID_HIL_OPTICAL_FLOW: - return new msg_hil_optical_flow(this); - + return new msg_hil_optical_flow(this); + case msg_hil_state_quaternion.MAVLINK_MSG_ID_HIL_STATE_QUATERNION: - return new msg_hil_state_quaternion(this); - + return new msg_hil_state_quaternion(this); + case msg_scaled_imu2.MAVLINK_MSG_ID_SCALED_IMU2: - return new msg_scaled_imu2(this); - + return new msg_scaled_imu2(this); + case msg_log_request_list.MAVLINK_MSG_ID_LOG_REQUEST_LIST: - return new msg_log_request_list(this); - + return new msg_log_request_list(this); + case msg_log_entry.MAVLINK_MSG_ID_LOG_ENTRY: - return new msg_log_entry(this); - + return new msg_log_entry(this); + case msg_log_request_data.MAVLINK_MSG_ID_LOG_REQUEST_DATA: - return new msg_log_request_data(this); - + return new msg_log_request_data(this); + case msg_log_data.MAVLINK_MSG_ID_LOG_DATA: - return new msg_log_data(this); - + return new msg_log_data(this); + case msg_log_erase.MAVLINK_MSG_ID_LOG_ERASE: - return new msg_log_erase(this); - + return new msg_log_erase(this); + case msg_log_request_end.MAVLINK_MSG_ID_LOG_REQUEST_END: - return new msg_log_request_end(this); - + return new msg_log_request_end(this); + case msg_gps_inject_data.MAVLINK_MSG_ID_GPS_INJECT_DATA: - return new msg_gps_inject_data(this); - + return new msg_gps_inject_data(this); + case msg_gps2_raw.MAVLINK_MSG_ID_GPS2_RAW: - return new msg_gps2_raw(this); - + return new msg_gps2_raw(this); + case msg_power_status.MAVLINK_MSG_ID_POWER_STATUS: - return new msg_power_status(this); - + return new msg_power_status(this); + case msg_serial_control.MAVLINK_MSG_ID_SERIAL_CONTROL: - return new msg_serial_control(this); - + return new msg_serial_control(this); + case msg_gps_rtk.MAVLINK_MSG_ID_GPS_RTK: - return new msg_gps_rtk(this); - + return new msg_gps_rtk(this); + case msg_gps2_rtk.MAVLINK_MSG_ID_GPS2_RTK: - return new msg_gps2_rtk(this); - + return new msg_gps2_rtk(this); + case msg_scaled_imu3.MAVLINK_MSG_ID_SCALED_IMU3: - return new msg_scaled_imu3(this); - + return new msg_scaled_imu3(this); + case msg_data_transmission_handshake.MAVLINK_MSG_ID_DATA_TRANSMISSION_HANDSHAKE: - return new msg_data_transmission_handshake(this); - + return new msg_data_transmission_handshake(this); + case msg_encapsulated_data.MAVLINK_MSG_ID_ENCAPSULATED_DATA: - return new msg_encapsulated_data(this); - + return new msg_encapsulated_data(this); + case msg_distance_sensor.MAVLINK_MSG_ID_DISTANCE_SENSOR: - return new msg_distance_sensor(this); - + return new msg_distance_sensor(this); + case msg_terrain_request.MAVLINK_MSG_ID_TERRAIN_REQUEST: - return new msg_terrain_request(this); - + return new msg_terrain_request(this); + case msg_terrain_data.MAVLINK_MSG_ID_TERRAIN_DATA: - return new msg_terrain_data(this); - + return new msg_terrain_data(this); + case msg_terrain_check.MAVLINK_MSG_ID_TERRAIN_CHECK: - return new msg_terrain_check(this); - + return new msg_terrain_check(this); + case msg_terrain_report.MAVLINK_MSG_ID_TERRAIN_REPORT: - return new msg_terrain_report(this); - + return new msg_terrain_report(this); + case msg_scaled_pressure2.MAVLINK_MSG_ID_SCALED_PRESSURE2: - return new msg_scaled_pressure2(this); - + return new msg_scaled_pressure2(this); + case msg_att_pos_mocap.MAVLINK_MSG_ID_ATT_POS_MOCAP: - return new msg_att_pos_mocap(this); - + return new msg_att_pos_mocap(this); + case msg_set_actuator_control_target.MAVLINK_MSG_ID_SET_ACTUATOR_CONTROL_TARGET: - return new msg_set_actuator_control_target(this); - + return new msg_set_actuator_control_target(this); + case msg_actuator_control_target.MAVLINK_MSG_ID_ACTUATOR_CONTROL_TARGET: - return new msg_actuator_control_target(this); - + return new msg_actuator_control_target(this); + case msg_altitude.MAVLINK_MSG_ID_ALTITUDE: - return new msg_altitude(this); - + return new msg_altitude(this); + case msg_resource_request.MAVLINK_MSG_ID_RESOURCE_REQUEST: - return new msg_resource_request(this); - + return new msg_resource_request(this); + case msg_scaled_pressure3.MAVLINK_MSG_ID_SCALED_PRESSURE3: - return new msg_scaled_pressure3(this); - + return new msg_scaled_pressure3(this); + case msg_follow_target.MAVLINK_MSG_ID_FOLLOW_TARGET: - return new msg_follow_target(this); - + return new msg_follow_target(this); + case msg_control_system_state.MAVLINK_MSG_ID_CONTROL_SYSTEM_STATE: - return new msg_control_system_state(this); - + return new msg_control_system_state(this); + case msg_battery_status.MAVLINK_MSG_ID_BATTERY_STATUS: - return new msg_battery_status(this); - + return new msg_battery_status(this); + case msg_autopilot_version.MAVLINK_MSG_ID_AUTOPILOT_VERSION: - return new msg_autopilot_version(this); - + return new msg_autopilot_version(this); + case msg_landing_target.MAVLINK_MSG_ID_LANDING_TARGET: - return new msg_landing_target(this); - + return new msg_landing_target(this); + case msg_fence_status.MAVLINK_MSG_ID_FENCE_STATUS: - return new msg_fence_status(this); - + return new msg_fence_status(this); + case msg_estimator_status.MAVLINK_MSG_ID_ESTIMATOR_STATUS: - return new msg_estimator_status(this); - + return new msg_estimator_status(this); + case msg_wind_cov.MAVLINK_MSG_ID_WIND_COV: - return new msg_wind_cov(this); - + return new msg_wind_cov(this); + case msg_gps_input.MAVLINK_MSG_ID_GPS_INPUT: - return new msg_gps_input(this); - + return new msg_gps_input(this); + case msg_gps_rtcm_data.MAVLINK_MSG_ID_GPS_RTCM_DATA: - return new msg_gps_rtcm_data(this); - + return new msg_gps_rtcm_data(this); + case msg_high_latency.MAVLINK_MSG_ID_HIGH_LATENCY: - return new msg_high_latency(this); - + return new msg_high_latency(this); + case msg_high_latency2.MAVLINK_MSG_ID_HIGH_LATENCY2: - return new msg_high_latency2(this); - + return new msg_high_latency2(this); + case msg_vibration.MAVLINK_MSG_ID_VIBRATION: - return new msg_vibration(this); - + return new msg_vibration(this); + case msg_home_position.MAVLINK_MSG_ID_HOME_POSITION: - return new msg_home_position(this); - + return new msg_home_position(this); + case msg_set_home_position.MAVLINK_MSG_ID_SET_HOME_POSITION: - return new msg_set_home_position(this); - + return new msg_set_home_position(this); + case msg_message_interval.MAVLINK_MSG_ID_MESSAGE_INTERVAL: - return new msg_message_interval(this); - + return new msg_message_interval(this); + case msg_extended_sys_state.MAVLINK_MSG_ID_EXTENDED_SYS_STATE: - return new msg_extended_sys_state(this); - + return new msg_extended_sys_state(this); + case msg_adsb_vehicle.MAVLINK_MSG_ID_ADSB_VEHICLE: - return new msg_adsb_vehicle(this); - + return new msg_adsb_vehicle(this); + case msg_collision.MAVLINK_MSG_ID_COLLISION: - return new msg_collision(this); - + return new msg_collision(this); + case msg_v2_extension.MAVLINK_MSG_ID_V2_EXTENSION: - return new msg_v2_extension(this); - + return new msg_v2_extension(this); + case msg_memory_vect.MAVLINK_MSG_ID_MEMORY_VECT: - return new msg_memory_vect(this); - + return new msg_memory_vect(this); + case msg_debug_vect.MAVLINK_MSG_ID_DEBUG_VECT: - return new msg_debug_vect(this); - + return new msg_debug_vect(this); + case msg_named_value_float.MAVLINK_MSG_ID_NAMED_VALUE_FLOAT: - return new msg_named_value_float(this); - + return new msg_named_value_float(this); + case msg_named_value_int.MAVLINK_MSG_ID_NAMED_VALUE_INT: - return new msg_named_value_int(this); - + return new msg_named_value_int(this); + case msg_statustext.MAVLINK_MSG_ID_STATUSTEXT: - return new msg_statustext(this); - + return new msg_statustext(this); + case msg_debug.MAVLINK_MSG_ID_DEBUG: - return new msg_debug(this); - + return new msg_debug(this); + case msg_setup_signing.MAVLINK_MSG_ID_SETUP_SIGNING: - return new msg_setup_signing(this); - + return new msg_setup_signing(this); + case msg_button_change.MAVLINK_MSG_ID_BUTTON_CHANGE: - return new msg_button_change(this); - + return new msg_button_change(this); + case msg_play_tune.MAVLINK_MSG_ID_PLAY_TUNE: - return new msg_play_tune(this); - + return new msg_play_tune(this); + case msg_camera_information.MAVLINK_MSG_ID_CAMERA_INFORMATION: - return new msg_camera_information(this); - + return new msg_camera_information(this); + case msg_camera_settings.MAVLINK_MSG_ID_CAMERA_SETTINGS: - return new msg_camera_settings(this); - + return new msg_camera_settings(this); + case msg_storage_information.MAVLINK_MSG_ID_STORAGE_INFORMATION: - return new msg_storage_information(this); - + return new msg_storage_information(this); + case msg_camera_capture_status.MAVLINK_MSG_ID_CAMERA_CAPTURE_STATUS: - return new msg_camera_capture_status(this); - + return new msg_camera_capture_status(this); + case msg_camera_image_captured.MAVLINK_MSG_ID_CAMERA_IMAGE_CAPTURED: - return new msg_camera_image_captured(this); - + return new msg_camera_image_captured(this); + case msg_flight_information.MAVLINK_MSG_ID_FLIGHT_INFORMATION: - return new msg_flight_information(this); - + return new msg_flight_information(this); + case msg_mount_orientation.MAVLINK_MSG_ID_MOUNT_ORIENTATION: - return new msg_mount_orientation(this); - + return new msg_mount_orientation(this); + case msg_logging_data.MAVLINK_MSG_ID_LOGGING_DATA: - return new msg_logging_data(this); - + return new msg_logging_data(this); + case msg_logging_data_acked.MAVLINK_MSG_ID_LOGGING_DATA_ACKED: - return new msg_logging_data_acked(this); - + return new msg_logging_data_acked(this); + case msg_logging_ack.MAVLINK_MSG_ID_LOGGING_ACK: - return new msg_logging_ack(this); - + return new msg_logging_ack(this); + case msg_video_stream_information.MAVLINK_MSG_ID_VIDEO_STREAM_INFORMATION: - return new msg_video_stream_information(this); - + return new msg_video_stream_information(this); + case msg_video_stream_status.MAVLINK_MSG_ID_VIDEO_STREAM_STATUS: - return new msg_video_stream_status(this); - + return new msg_video_stream_status(this); + case msg_wifi_config_ap.MAVLINK_MSG_ID_WIFI_CONFIG_AP: - return new msg_wifi_config_ap(this); - + return new msg_wifi_config_ap(this); + case msg_protocol_version.MAVLINK_MSG_ID_PROTOCOL_VERSION: - return new msg_protocol_version(this); - + return new msg_protocol_version(this); + case msg_ais_vessel.MAVLINK_MSG_ID_AIS_VESSEL: - return new msg_ais_vessel(this); - + return new msg_ais_vessel(this); + case msg_uavcan_node_status.MAVLINK_MSG_ID_UAVCAN_NODE_STATUS: - return new msg_uavcan_node_status(this); - + return new msg_uavcan_node_status(this); + case msg_uavcan_node_info.MAVLINK_MSG_ID_UAVCAN_NODE_INFO: - return new msg_uavcan_node_info(this); - + return new msg_uavcan_node_info(this); + case msg_param_ext_request_read.MAVLINK_MSG_ID_PARAM_EXT_REQUEST_READ: - return new msg_param_ext_request_read(this); - + return new msg_param_ext_request_read(this); + case msg_param_ext_request_list.MAVLINK_MSG_ID_PARAM_EXT_REQUEST_LIST: - return new msg_param_ext_request_list(this); - + return new msg_param_ext_request_list(this); + case msg_param_ext_value.MAVLINK_MSG_ID_PARAM_EXT_VALUE: - return new msg_param_ext_value(this); - + return new msg_param_ext_value(this); + case msg_param_ext_set.MAVLINK_MSG_ID_PARAM_EXT_SET: - return new msg_param_ext_set(this); - + return new msg_param_ext_set(this); + case msg_param_ext_ack.MAVLINK_MSG_ID_PARAM_EXT_ACK: - return new msg_param_ext_ack(this); - + return new msg_param_ext_ack(this); + case msg_obstacle_distance.MAVLINK_MSG_ID_OBSTACLE_DISTANCE: - return new msg_obstacle_distance(this); - + return new msg_obstacle_distance(this); + case msg_odometry.MAVLINK_MSG_ID_ODOMETRY: - return new msg_odometry(this); - + return new msg_odometry(this); + case msg_trajectory_representation_waypoints.MAVLINK_MSG_ID_TRAJECTORY_REPRESENTATION_WAYPOINTS: - return new msg_trajectory_representation_waypoints(this); - + return new msg_trajectory_representation_waypoints(this); + case msg_trajectory_representation_bezier.MAVLINK_MSG_ID_TRAJECTORY_REPRESENTATION_BEZIER: - return new msg_trajectory_representation_bezier(this); - + return new msg_trajectory_representation_bezier(this); + case msg_cellular_status.MAVLINK_MSG_ID_CELLULAR_STATUS: - return new msg_cellular_status(this); - + return new msg_cellular_status(this); + case msg_isbd_link_status.MAVLINK_MSG_ID_ISBD_LINK_STATUS: - return new msg_isbd_link_status(this); - + return new msg_isbd_link_status(this); + case msg_utm_global_position.MAVLINK_MSG_ID_UTM_GLOBAL_POSITION: - return new msg_utm_global_position(this); - + return new msg_utm_global_position(this); + case msg_debug_float_array.MAVLINK_MSG_ID_DEBUG_FLOAT_ARRAY: - return new msg_debug_float_array(this); - + return new msg_debug_float_array(this); + case msg_orbit_execution_status.MAVLINK_MSG_ID_ORBIT_EXECUTION_STATUS: - return new msg_orbit_execution_status(this); - + return new msg_orbit_execution_status(this); + case msg_smart_battery_info.MAVLINK_MSG_ID_SMART_BATTERY_INFO: - return new msg_smart_battery_info(this); - + return new msg_smart_battery_info(this); + case msg_smart_battery_status.MAVLINK_MSG_ID_SMART_BATTERY_STATUS: - return new msg_smart_battery_status(this); - + return new msg_smart_battery_status(this); + case msg_actuator_output_status.MAVLINK_MSG_ID_ACTUATOR_OUTPUT_STATUS: - return new msg_actuator_output_status(this); - + return new msg_actuator_output_status(this); + case msg_time_estimate_to_target.MAVLINK_MSG_ID_TIME_ESTIMATE_TO_TARGET: - return new msg_time_estimate_to_target(this); - + return new msg_time_estimate_to_target(this); + case msg_tunnel.MAVLINK_MSG_ID_TUNNEL: - return new msg_tunnel(this); - + return new msg_tunnel(this); + case msg_onboard_computer_status.MAVLINK_MSG_ID_ONBOARD_COMPUTER_STATUS: - return new msg_onboard_computer_status(this); - + return new msg_onboard_computer_status(this); + case msg_component_information.MAVLINK_MSG_ID_COMPONENT_INFORMATION: - return new msg_component_information(this); - + return new msg_component_information(this); + case msg_play_tune_v2.MAVLINK_MSG_ID_PLAY_TUNE_V2: - return new msg_play_tune_v2(this); - + return new msg_play_tune_v2(this); + case msg_supported_tunes.MAVLINK_MSG_ID_SUPPORTED_TUNES: - return new msg_supported_tunes(this); - + return new msg_supported_tunes(this); + case msg_wheel_distance.MAVLINK_MSG_ID_WHEEL_DISTANCE: - return new msg_wheel_distance(this); - + return new msg_wheel_distance(this); + case msg_open_drone_id_basic_id.MAVLINK_MSG_ID_OPEN_DRONE_ID_BASIC_ID: - return new msg_open_drone_id_basic_id(this); - + return new msg_open_drone_id_basic_id(this); + case msg_open_drone_id_location.MAVLINK_MSG_ID_OPEN_DRONE_ID_LOCATION: - return new msg_open_drone_id_location(this); - + return new msg_open_drone_id_location(this); + case msg_open_drone_id_authentication.MAVLINK_MSG_ID_OPEN_DRONE_ID_AUTHENTICATION: - return new msg_open_drone_id_authentication(this); - + return new msg_open_drone_id_authentication(this); + case msg_open_drone_id_self_id.MAVLINK_MSG_ID_OPEN_DRONE_ID_SELF_ID: - return new msg_open_drone_id_self_id(this); - + return new msg_open_drone_id_self_id(this); + case msg_open_drone_id_system.MAVLINK_MSG_ID_OPEN_DRONE_ID_SYSTEM: - return new msg_open_drone_id_system(this); - + return new msg_open_drone_id_system(this); + case msg_open_drone_id_operator_id.MAVLINK_MSG_ID_OPEN_DRONE_ID_OPERATOR_ID: - return new msg_open_drone_id_operator_id(this); - + return new msg_open_drone_id_operator_id(this); + case msg_open_drone_id_message_pack.MAVLINK_MSG_ID_OPEN_DRONE_ID_MESSAGE_PACK: - return new msg_open_drone_id_message_pack(this); - - + return new msg_open_drone_id_message_pack(this); + + case msg_uavionix_adsb_out_cfg.MAVLINK_MSG_ID_UAVIONIX_ADSB_OUT_CFG: - return new msg_uavionix_adsb_out_cfg(this); - + return new msg_uavionix_adsb_out_cfg(this); + case msg_uavionix_adsb_out_dynamic.MAVLINK_MSG_ID_UAVIONIX_ADSB_OUT_DYNAMIC: - return new msg_uavionix_adsb_out_dynamic(this); - + return new msg_uavionix_adsb_out_dynamic(this); + case msg_uavionix_adsb_transceiver_health_report.MAVLINK_MSG_ID_UAVIONIX_ADSB_TRANSCEIVER_HEALTH_REPORT: - return new msg_uavionix_adsb_transceiver_health_report(this); - - + return new msg_uavionix_adsb_transceiver_health_report(this); + + case msg_icarous_heartbeat.MAVLINK_MSG_ID_ICAROUS_HEARTBEAT: - return new msg_icarous_heartbeat(this); - + return new msg_icarous_heartbeat(this); + case msg_icarous_kinematic_bands.MAVLINK_MSG_ID_ICAROUS_KINEMATIC_BANDS: - return new msg_icarous_kinematic_bands(this); - - + return new msg_icarous_kinematic_bands(this); + + default: return null; } diff --git a/app/src/main/java/com/MAVLink/Messages/MAVLinkMessage.java b/app/src/main/java/com/MAVLink/Messages/MAVLinkMessage.java index 768befd..d71eef1 100644 --- a/app/src/main/java/com/MAVLink/Messages/MAVLinkMessage.java +++ b/app/src/main/java/com/MAVLink/Messages/MAVLinkMessage.java @@ -6,22 +6,24 @@ package com.MAVLink.Messages; -import java.io.Serializable; - import com.MAVLink.MAVLinkPacket; +import java.io.Serializable; + public abstract class MAVLinkMessage implements Serializable { private static final long serialVersionUID = -7754622750478538539L; // The MAVLink message classes have been changed to implement Serializable, // this way is possible to pass a mavlink message trought the Service-Acctivity interface - + /** - * Simply a common interface for all MAVLink Messages + * Simply a common interface for all MAVLink Messages */ - + public int sysid; public int compid; public int msgid; + public abstract MAVLinkPacket pack(); + public abstract void unpack(MAVLinkPayload payload); } diff --git a/app/src/main/java/com/MAVLink/Messages/MAVLinkPayload.java b/app/src/main/java/com/MAVLink/Messages/MAVLinkPayload.java index a6743ea..a351144 100644 --- a/app/src/main/java/com/MAVLink/Messages/MAVLinkPayload.java +++ b/app/src/main/java/com/MAVLink/Messages/MAVLinkPayload.java @@ -22,12 +22,12 @@ public class MAVLinkPayload { private static final long UNSIGNED_LONG_MIN_VALUE = 0; public static final int MAX_PAYLOAD_SIZE = 255; - + public final ByteBuffer payload; public int index; public MAVLinkPayload(int payloadSize) { - if(payloadSize > MAX_PAYLOAD_SIZE) { + if (payloadSize > MAX_PAYLOAD_SIZE) { payload = ByteBuffer.allocate(MAX_PAYLOAD_SIZE); } else { payload = ByteBuffer.allocate(payloadSize); @@ -56,16 +56,17 @@ public class MAVLinkPayload { index += 1; return result; } -// TERJE BUGG.... - public short getUnsignedByte(){ + + // TERJE BUGG.... + public short getUnsignedByte() { short result = 0; - if( payload.array().length > index) { + if (payload.array().length > index) { result |= payload.get(index + 0) & 0xFF; index += 1; - }else{ + } else { // ERROR:::: } - return result; + return result; } public short getShort() { @@ -76,7 +77,7 @@ public class MAVLinkPayload { return result; } - public int getUnsignedShort(){ + public int getUnsignedShort() { int result = 0; result |= (payload.get(index + 1) & 0xFF) << 8; result |= (payload.get(index + 0) & 0xFF); @@ -94,7 +95,7 @@ public class MAVLinkPayload { return result; } - public long getUnsignedInt(){ + public long getUnsignedInt() { long result = 0; result |= (payload.get(index + 3) & 0xFFL) << 24; result |= (payload.get(index + 2) & 0xFFL) << 16; @@ -118,10 +119,10 @@ public class MAVLinkPayload { return result; } - public long getUnsignedLong(){ + public long getUnsignedLong() { return getLong(); } - + public long getLongReverse() { long result = 0; result |= (payload.get(index + 0) & 0xFFL) << 56; @@ -140,14 +141,16 @@ public class MAVLinkPayload { return Float.intBitsToFloat(getInt()); } - public double getDouble() { return Double.longBitsToDouble(getLong());} + public double getDouble() { + return Double.longBitsToDouble(getLong()); + } public void putByte(byte data) { add(data); } - public void putUnsignedByte(short data){ - if(data < UNSIGNED_BYTE_MIN_VALUE || data > UNSIGNED_BYTE_MAX_VALUE){ + public void putUnsignedByte(short data) { + if (data < UNSIGNED_BYTE_MIN_VALUE || data > UNSIGNED_BYTE_MAX_VALUE) { throw new IllegalArgumentException("Value is outside of the range of an unsigned byte: " + data); } @@ -159,8 +162,8 @@ public class MAVLinkPayload { add((byte) (data >> 8)); } - public void putUnsignedShort(int data){ - if(data < UNSIGNED_SHORT_MIN_VALUE || data > UNSIGNED_SHORT_MAX_VALUE){ + public void putUnsignedShort(int data) { + if (data < UNSIGNED_SHORT_MIN_VALUE || data > UNSIGNED_SHORT_MAX_VALUE) { throw new IllegalArgumentException("Value is outside of the range of an unsigned short: " + data); } @@ -174,8 +177,8 @@ public class MAVLinkPayload { add((byte) (data >> 24)); } - public void putUnsignedInt(long data){ - if(data < UNSIGNED_INT_MIN_VALUE || data > UNSIGNED_INT_MAX_VALUE){ + public void putUnsignedInt(long data) { + if (data < UNSIGNED_INT_MIN_VALUE || data > UNSIGNED_INT_MAX_VALUE) { throw new IllegalArgumentException("Value is outside of the range of an unsigned int: " + data); } @@ -193,8 +196,8 @@ public class MAVLinkPayload { add((byte) (data >> 56)); } - public void putUnsignedLong(long data){ - if(data < UNSIGNED_LONG_MIN_VALUE){ + public void putUnsignedLong(long data) { + if (data < UNSIGNED_LONG_MIN_VALUE) { throw new IllegalArgumentException("Value is outside of the range of an unsigned long: " + data); } @@ -205,6 +208,8 @@ public class MAVLinkPayload { putInt(Float.floatToIntBits(data)); } - public void putDouble(double data) { putLong(Double.doubleToLongBits(data)); } + public void putDouble(double data) { + putLong(Double.doubleToLongBits(data)); + } } diff --git a/app/src/main/java/com/MAVLink/Messages/MAVLinkStats.java b/app/src/main/java/com/MAVLink/Messages/MAVLinkStats.java index 7f9c76f..b84aa62 100644 --- a/app/src/main/java/com/MAVLink/Messages/MAVLinkStats.java +++ b/app/src/main/java/com/MAVLink/Messages/MAVLinkStats.java @@ -11,9 +11,8 @@ import com.MAVLink.common.msg_radio_status; /** * Storage for MAVLink Packet and Error statistics - * */ -public class MAVLinkStats /* implements Serializable */{ +public class MAVLinkStats /* implements Serializable */ { public int receivedPacketCount; // total recieved packet count for all sources @@ -38,9 +37,8 @@ public class MAVLinkStats /* implements Serializable */{ /** * Check the new received packet to see if has lost someone between this and * the last packet - * - * @param packet - * Packet that should be checked + * + * @param packet Packet that should be checked */ public void newPacket(MAVLinkPacket packet) { if (ignoreRadioPackets && packet.msgid == msg_radio_status.MAVLINK_MSG_ID_RADIO_STATUS) { @@ -144,7 +142,7 @@ public class MAVLinkStats /* implements Serializable */{ } private boolean hasLostPackets(MAVLinkPacket packet) { - return lastPacketSeq >= 0 && packet.seq != lastPacketSeq; + return lastPacketSeq >= 0 && packet.seq != lastPacketSeq; } } diff --git a/app/src/main/java/com/MAVLink/Parser.java b/app/src/main/java/com/MAVLink/Parser.java index 0b295b5..a5b3ab7 100644 --- a/app/src/main/java/com/MAVLink/Parser.java +++ b/app/src/main/java/com/MAVLink/Parser.java @@ -6,7 +6,6 @@ package com.MAVLink; -import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkStats; public class Parser { @@ -36,88 +35,87 @@ public class Parser { * parsing. the function will parse one byte at a time and return the * complete packet once it could be successfully decoded. Checksum and other * failures will be silently ignored. - * - * @param c - * The char to parse + * + * @param c The char to parse */ public MAVLinkPacket mavlink_parse_char(int c) { switch (state) { - case MAVLINK_PARSE_STATE_UNINIT: - case MAVLINK_PARSE_STATE_IDLE: + case MAVLINK_PARSE_STATE_UNINIT: + case MAVLINK_PARSE_STATE_IDLE: - if (c == MAVLinkPacket.MAVLINK_STX) { - state = MAV_states.MAVLINK_PARSE_STATE_GOT_STX; - } - break; - - case MAVLINK_PARSE_STATE_GOT_STX: - m = new MAVLinkPacket(c); - state = MAV_states.MAVLINK_PARSE_STATE_GOT_LENGTH; - break; - - case MAVLINK_PARSE_STATE_GOT_LENGTH: - m.seq = c; - state = MAV_states.MAVLINK_PARSE_STATE_GOT_SEQ; - break; - - case MAVLINK_PARSE_STATE_GOT_SEQ: - m.sysid = c; - state = MAV_states.MAVLINK_PARSE_STATE_GOT_SYSID; - break; - - case MAVLINK_PARSE_STATE_GOT_SYSID: - m.compid = c; - state = MAV_states.MAVLINK_PARSE_STATE_GOT_COMPID; - break; - - case MAVLINK_PARSE_STATE_GOT_COMPID: - m.msgid = c; - if (m.len == 0) { - state = MAV_states.MAVLINK_PARSE_STATE_GOT_PAYLOAD; - } else { - state = MAV_states.MAVLINK_PARSE_STATE_GOT_MSGID; - } - break; - - case MAVLINK_PARSE_STATE_GOT_MSGID: - m.payload.add((byte) c); - if (m.payloadIsFilled()) { - state = MAV_states.MAVLINK_PARSE_STATE_GOT_PAYLOAD; - } - break; - - case MAVLINK_PARSE_STATE_GOT_PAYLOAD: - m.generateCRC(); - // Check first checksum byte - if (c != m.crc.getLSB()) { - state = MAV_states.MAVLINK_PARSE_STATE_IDLE; if (c == MAVLinkPacket.MAVLINK_STX) { state = MAV_states.MAVLINK_PARSE_STATE_GOT_STX; - m.crc.start_checksum(); } - stats.crcError(); - } else { - state = MAV_states.MAVLINK_PARSE_STATE_GOT_CRC1; - } - break; + break; - case MAVLINK_PARSE_STATE_GOT_CRC1: - // Check second checksum byte - if (c != m.crc.getMSB()) { - state = MAV_states.MAVLINK_PARSE_STATE_IDLE; - if (c == MAVLinkPacket.MAVLINK_STX) { - state = MAV_states.MAVLINK_PARSE_STATE_GOT_STX; - m.crc.start_checksum(); + case MAVLINK_PARSE_STATE_GOT_STX: + m = new MAVLinkPacket(c); + state = MAV_states.MAVLINK_PARSE_STATE_GOT_LENGTH; + break; + + case MAVLINK_PARSE_STATE_GOT_LENGTH: + m.seq = c; + state = MAV_states.MAVLINK_PARSE_STATE_GOT_SEQ; + break; + + case MAVLINK_PARSE_STATE_GOT_SEQ: + m.sysid = c; + state = MAV_states.MAVLINK_PARSE_STATE_GOT_SYSID; + break; + + case MAVLINK_PARSE_STATE_GOT_SYSID: + m.compid = c; + state = MAV_states.MAVLINK_PARSE_STATE_GOT_COMPID; + break; + + case MAVLINK_PARSE_STATE_GOT_COMPID: + m.msgid = c; + if (m.len == 0) { + state = MAV_states.MAVLINK_PARSE_STATE_GOT_PAYLOAD; + } else { + state = MAV_states.MAVLINK_PARSE_STATE_GOT_MSGID; } - stats.crcError(); - } else { // Successfully received the message - stats.newPacket(m); - state = MAV_states.MAVLINK_PARSE_STATE_IDLE; - return m; - } + break; - break; + case MAVLINK_PARSE_STATE_GOT_MSGID: + m.payload.add((byte) c); + if (m.payloadIsFilled()) { + state = MAV_states.MAVLINK_PARSE_STATE_GOT_PAYLOAD; + } + break; + + case MAVLINK_PARSE_STATE_GOT_PAYLOAD: + m.generateCRC(); + // Check first checksum byte + if (c != m.crc.getLSB()) { + state = MAV_states.MAVLINK_PARSE_STATE_IDLE; + if (c == MAVLinkPacket.MAVLINK_STX) { + state = MAV_states.MAVLINK_PARSE_STATE_GOT_STX; + m.crc.start_checksum(); + } + stats.crcError(); + } else { + state = MAV_states.MAVLINK_PARSE_STATE_GOT_CRC1; + } + break; + + case MAVLINK_PARSE_STATE_GOT_CRC1: + // Check second checksum byte + if (c != m.crc.getMSB()) { + state = MAV_states.MAVLINK_PARSE_STATE_IDLE; + if (c == MAVLinkPacket.MAVLINK_STX) { + state = MAV_states.MAVLINK_PARSE_STATE_GOT_STX; + m.crc.start_checksum(); + } + stats.crcError(); + } else { // Successfully received the message + stats.newPacket(m); + state = MAV_states.MAVLINK_PARSE_STATE_IDLE; + return m; + } + + break; } return null; diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/CRC.java b/app/src/main/java/com/MAVLink/ardupilotmega/CRC.java index 061e7fb..518e525 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/CRC.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/CRC.java @@ -7,26 +7,24 @@ package com.MAVLink.ardupilotmega; /** -* X.25 CRC calculation for MAVlink messages. The checksum must be initialized, -* updated with witch field of the message, and then finished with the message -* id. -* -*/ + * X.25 CRC calculation for MAVlink messages. The checksum must be initialized, + * updated with witch field of the message, and then finished with the message + * id. + */ public class CRC { private static final int[] MAVLINK_MESSAGE_CRCS = {50, 124, 137, 0, 237, 217, 104, 119, 117, 0, 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, 214, 159, 220, 168, 24, 23, 170, 144, 67, 115, 39, 246, 185, 104, 237, 244, 222, 212, 9, 254, 230, 28, 28, 132, 221, 232, 11, 153, 41, 39, 78, 196, 132, 0, 15, 3, 0, 0, 0, 0, 0, 167, 183, 119, 191, 118, 148, 21, 0, 243, 124, 0, 0, 38, 20, 158, 152, 143, 0, 0, 0, 106, 49, 22, 143, 140, 5, 150, 0, 231, 183, 63, 54, 47, 0, 0, 0, 0, 0, 0, 175, 102, 158, 208, 56, 93, 138, 108, 32, 185, 84, 34, 174, 124, 237, 4, 76, 128, 56, 116, 134, 237, 203, 250, 87, 203, 220, 25, 226, 46, 29, 223, 85, 6, 229, 203, 1, 195, 109, 168, 181, 47, 72, 131, 127, 0, 103, 154, 178, 200, 134, 219, 208, 188, 84, 22, 19, 21, 134, 0, 78, 68, 189, 127, 154, 21, 21, 144, 1, 234, 73, 181, 22, 83, 167, 138, 234, 240, 47, 189, 52, 174, 229, 85, 159, 186, 72, 0, 0, 0, 0, 92, 36, 71, 98, 120, 0, 0, 0, 0, 134, 205, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 69, 101, 50, 202, 17, 162, 0, 0, 0, 0, 0, 142, 207, 0, 0, 0, 163, 105, 151, 35, 150, 179, 0, 0, 0, 0, 0, 90, 104, 85, 95, 130, 184, 81, 8, 204, 49, 170, 44, 83, 46, 0}; private static final int CRC_INIT_VALUE = 0xffff; private int crcValue; /** - * Accumulate the X.25 CRC by adding one char at a time. - * - * The checksum function adds the hash of one char at a time to the 16 bit - * checksum (uint16_t). - * - * @param data - * new char to hash - **/ - public void update_checksum(int data) { + * Accumulate the X.25 CRC by adding one char at a time. + *

+ * The checksum function adds the hash of one char at a time to the 16 bit + * checksum (uint16_t). + * + * @param data new char to hash + **/ + public void update_checksum(int data) { data = data & 0xff; //cast because we want an unsigned type int tmp = data ^ (crcValue & 0xff); tmp ^= (tmp << 4) & 0xff; @@ -34,20 +32,18 @@ public class CRC { } /** - * Finish the CRC calculation of a message, by running the CRC with the - * Magic Byte. This Magic byte has been defined in MAVlink v1.0. - * - * @param msgid - * The message id number - */ + * Finish the CRC calculation of a message, by running the CRC with the + * Magic Byte. This Magic byte has been defined in MAVlink v1.0. + * + * @param msgid The message id number + */ public void finish_checksum(int msgid) { update_checksum(MAVLINK_MESSAGE_CRCS[msgid]); } /** - * Initialize the buffer for the X.25 CRC - * - */ + * Initialize the buffer for the X.25 CRC + */ public void start_checksum() { crcValue = CRC_INIT_VALUE; } diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_adap_tuning.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_adap_tuning.java index 8924f51..ad1c6d1 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_adap_tuning.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_adap_tuning.java @@ -6,187 +6,187 @@ // MESSAGE ADAP_TUNING PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Adaptive Controller tuning information. -*/ -public class msg_adap_tuning extends MAVLinkMessage{ + * Adaptive Controller tuning information. + */ +public class msg_adap_tuning extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_ADAP_TUNING = 11010; public static final int MAVLINK_MSG_LENGTH = 49; private static final long serialVersionUID = MAVLINK_MSG_ID_ADAP_TUNING; - /** - * Desired rate. - */ + * Desired rate. + */ public float desired; - - /** - * Achieved rate. - */ - public float achieved; - - /** - * Error between model and vehicle. - */ - public float error; - - /** - * Theta estimated state predictor. - */ - public float theta; - - /** - * Omega estimated state predictor. - */ - public float omega; - - /** - * Sigma estimated state predictor. - */ - public float sigma; - - /** - * Theta derivative. - */ - public float theta_dot; - - /** - * Omega derivative. - */ - public float omega_dot; - - /** - * Sigma derivative. - */ - public float sigma_dot; - - /** - * Projection operator value. - */ - public float f; - - /** - * Projection operator derivative. - */ - public float f_dot; - - /** - * u adaptive controlled output command. - */ - public float u; - - /** - * Axis. - */ - public short axis; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Achieved rate. + */ + public float achieved; + + /** + * Error between model and vehicle. + */ + public float error; + + /** + * Theta estimated state predictor. + */ + public float theta; + + /** + * Omega estimated state predictor. + */ + public float omega; + + /** + * Sigma estimated state predictor. + */ + public float sigma; + + /** + * Theta derivative. + */ + public float theta_dot; + + /** + * Omega derivative. + */ + public float omega_dot; + + /** + * Sigma derivative. + */ + public float sigma_dot; + + /** + * Projection operator value. + */ + public float f; + + /** + * Projection operator derivative. + */ + public float f_dot; + + /** + * u adaptive controlled output command. + */ + public float u; + + /** + * Axis. + */ + public short axis; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_ADAP_TUNING; - + packet.payload.putFloat(desired); - + packet.payload.putFloat(achieved); - + packet.payload.putFloat(error); - + packet.payload.putFloat(theta); - + packet.payload.putFloat(omega); - + packet.payload.putFloat(sigma); - + packet.payload.putFloat(theta_dot); - + packet.payload.putFloat(omega_dot); - + packet.payload.putFloat(sigma_dot); - + packet.payload.putFloat(f); - + packet.payload.putFloat(f_dot); - + packet.payload.putFloat(u); - + packet.payload.putUnsignedByte(axis); - + return packet; } /** - * Decode a adap_tuning message into this class fields - * - * @param payload The message to decode - */ + * Decode a adap_tuning message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.desired = payload.getFloat(); - + this.achieved = payload.getFloat(); - + this.error = payload.getFloat(); - + this.theta = payload.getFloat(); - + this.omega = payload.getFloat(); - + this.sigma = payload.getFloat(); - + this.theta_dot = payload.getFloat(); - + this.omega_dot = payload.getFloat(); - + this.sigma_dot = payload.getFloat(); - + this.f = payload.getFloat(); - + this.f_dot = payload.getFloat(); - + this.u = payload.getFloat(); - + this.axis = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_adap_tuning(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_adap_tuning() { msgid = MAVLINK_MSG_ID_ADAP_TUNING; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_adap_tuning(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_adap_tuning(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_ADAP_TUNING; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_ADAP_TUNING - sysid:"+sysid+" compid:"+compid+" desired:"+desired+" achieved:"+achieved+" error:"+error+" theta:"+theta+" omega:"+omega+" sigma:"+sigma+" theta_dot:"+theta_dot+" omega_dot:"+omega_dot+" sigma_dot:"+sigma_dot+" f:"+f+" f_dot:"+f_dot+" u:"+u+" axis:"+axis+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_ADAP_TUNING - sysid:" + sysid + " compid:" + compid + " desired:" + desired + " achieved:" + achieved + " error:" + error + " theta:" + theta + " omega:" + omega + " sigma:" + sigma + " theta_dot:" + theta_dot + " omega_dot:" + omega_dot + " sigma_dot:" + sigma_dot + " f:" + f + " f_dot:" + f_dot + " u:" + u + " axis:" + axis + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_ahrs.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_ahrs.java index 4a3b360..aa36312 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_ahrs.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_ahrs.java @@ -6,133 +6,133 @@ // MESSAGE AHRS PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Status of DCM attitude estimator. -*/ -public class msg_ahrs extends MAVLinkMessage{ + * Status of DCM attitude estimator. + */ +public class msg_ahrs extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_AHRS = 163; public static final int MAVLINK_MSG_LENGTH = 28; private static final long serialVersionUID = MAVLINK_MSG_ID_AHRS; - /** - * X gyro drift estimate. - */ + * X gyro drift estimate. + */ public float omegaIx; - - /** - * Y gyro drift estimate. - */ - public float omegaIy; - - /** - * Z gyro drift estimate. - */ - public float omegaIz; - - /** - * Average accel_weight. - */ - public float accel_weight; - - /** - * Average renormalisation value. - */ - public float renorm_val; - - /** - * Average error_roll_pitch value. - */ - public float error_rp; - - /** - * Average error_yaw value. - */ - public float error_yaw; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Y gyro drift estimate. + */ + public float omegaIy; + + /** + * Z gyro drift estimate. + */ + public float omegaIz; + + /** + * Average accel_weight. + */ + public float accel_weight; + + /** + * Average renormalisation value. + */ + public float renorm_val; + + /** + * Average error_roll_pitch value. + */ + public float error_rp; + + /** + * Average error_yaw value. + */ + public float error_yaw; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_AHRS; - + packet.payload.putFloat(omegaIx); - + packet.payload.putFloat(omegaIy); - + packet.payload.putFloat(omegaIz); - + packet.payload.putFloat(accel_weight); - + packet.payload.putFloat(renorm_val); - + packet.payload.putFloat(error_rp); - + packet.payload.putFloat(error_yaw); - + return packet; } /** - * Decode a ahrs message into this class fields - * - * @param payload The message to decode - */ + * Decode a ahrs message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.omegaIx = payload.getFloat(); - + this.omegaIy = payload.getFloat(); - + this.omegaIz = payload.getFloat(); - + this.accel_weight = payload.getFloat(); - + this.renorm_val = payload.getFloat(); - + this.error_rp = payload.getFloat(); - + this.error_yaw = payload.getFloat(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_ahrs(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_ahrs() { msgid = MAVLINK_MSG_ID_AHRS; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_ahrs(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_ahrs(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_AHRS; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_AHRS - sysid:"+sysid+" compid:"+compid+" omegaIx:"+omegaIx+" omegaIy:"+omegaIy+" omegaIz:"+omegaIz+" accel_weight:"+accel_weight+" renorm_val:"+renorm_val+" error_rp:"+error_rp+" error_yaw:"+error_yaw+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_AHRS - sysid:" + sysid + " compid:" + compid + " omegaIx:" + omegaIx + " omegaIy:" + omegaIy + " omegaIz:" + omegaIz + " accel_weight:" + accel_weight + " renorm_val:" + renorm_val + " error_rp:" + error_rp + " error_yaw:" + error_yaw + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_ahrs2.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_ahrs2.java index 6c4722a..51985c6 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_ahrs2.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_ahrs2.java @@ -6,124 +6,124 @@ // MESSAGE AHRS2 PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Status of secondary AHRS filter if available. -*/ -public class msg_ahrs2 extends MAVLinkMessage{ + * Status of secondary AHRS filter if available. + */ +public class msg_ahrs2 extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_AHRS2 = 178; public static final int MAVLINK_MSG_LENGTH = 24; private static final long serialVersionUID = MAVLINK_MSG_ID_AHRS2; - /** - * Roll angle. - */ + * Roll angle. + */ public float roll; - - /** - * Pitch angle. - */ - public float pitch; - - /** - * Yaw angle. - */ - public float yaw; - - /** - * Altitude (MSL). - */ - public float altitude; - - /** - * Latitude. - */ - public int lat; - - /** - * Longitude. - */ - public int lng; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Pitch angle. + */ + public float pitch; + + /** + * Yaw angle. + */ + public float yaw; + + /** + * Altitude (MSL). + */ + public float altitude; + + /** + * Latitude. + */ + public int lat; + + /** + * Longitude. + */ + public int lng; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_AHRS2; - + packet.payload.putFloat(roll); - + packet.payload.putFloat(pitch); - + packet.payload.putFloat(yaw); - + packet.payload.putFloat(altitude); - + packet.payload.putInt(lat); - + packet.payload.putInt(lng); - + return packet; } /** - * Decode a ahrs2 message into this class fields - * - * @param payload The message to decode - */ + * Decode a ahrs2 message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.roll = payload.getFloat(); - + this.pitch = payload.getFloat(); - + this.yaw = payload.getFloat(); - + this.altitude = payload.getFloat(); - + this.lat = payload.getInt(); - + this.lng = payload.getInt(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_ahrs2(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_ahrs2() { msgid = MAVLINK_MSG_ID_AHRS2; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_ahrs2(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_ahrs2(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_AHRS2; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_AHRS2 - sysid:"+sysid+" compid:"+compid+" roll:"+roll+" pitch:"+pitch+" yaw:"+yaw+" altitude:"+altitude+" lat:"+lat+" lng:"+lng+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_AHRS2 - sysid:" + sysid + " compid:" + compid + " roll:" + roll + " pitch:" + pitch + " yaw:" + yaw + " altitude:" + altitude + " lat:" + lat + " lng:" + lng + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_ahrs3.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_ahrs3.java index ed27265..ac788b0 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_ahrs3.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_ahrs3.java @@ -6,160 +6,160 @@ // MESSAGE AHRS3 PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Status of third AHRS filter if available. This is for ANU research group (Ali and Sean). -*/ -public class msg_ahrs3 extends MAVLinkMessage{ + * Status of third AHRS filter if available. This is for ANU research group (Ali and Sean). + */ +public class msg_ahrs3 extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_AHRS3 = 182; public static final int MAVLINK_MSG_LENGTH = 40; private static final long serialVersionUID = MAVLINK_MSG_ID_AHRS3; - /** - * Roll angle. - */ + * Roll angle. + */ public float roll; - - /** - * Pitch angle. - */ - public float pitch; - - /** - * Yaw angle. - */ - public float yaw; - - /** - * Altitude (MSL). - */ - public float altitude; - - /** - * Latitude. - */ - public int lat; - - /** - * Longitude. - */ - public int lng; - - /** - * Test variable1. - */ - public float v1; - - /** - * Test variable2. - */ - public float v2; - - /** - * Test variable3. - */ - public float v3; - - /** - * Test variable4. - */ - public float v4; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Pitch angle. + */ + public float pitch; + + /** + * Yaw angle. + */ + public float yaw; + + /** + * Altitude (MSL). + */ + public float altitude; + + /** + * Latitude. + */ + public int lat; + + /** + * Longitude. + */ + public int lng; + + /** + * Test variable1. + */ + public float v1; + + /** + * Test variable2. + */ + public float v2; + + /** + * Test variable3. + */ + public float v3; + + /** + * Test variable4. + */ + public float v4; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_AHRS3; - + packet.payload.putFloat(roll); - + packet.payload.putFloat(pitch); - + packet.payload.putFloat(yaw); - + packet.payload.putFloat(altitude); - + packet.payload.putInt(lat); - + packet.payload.putInt(lng); - + packet.payload.putFloat(v1); - + packet.payload.putFloat(v2); - + packet.payload.putFloat(v3); - + packet.payload.putFloat(v4); - + return packet; } /** - * Decode a ahrs3 message into this class fields - * - * @param payload The message to decode - */ + * Decode a ahrs3 message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.roll = payload.getFloat(); - + this.pitch = payload.getFloat(); - + this.yaw = payload.getFloat(); - + this.altitude = payload.getFloat(); - + this.lat = payload.getInt(); - + this.lng = payload.getInt(); - + this.v1 = payload.getFloat(); - + this.v2 = payload.getFloat(); - + this.v3 = payload.getFloat(); - + this.v4 = payload.getFloat(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_ahrs3(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_ahrs3() { msgid = MAVLINK_MSG_ID_AHRS3; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_ahrs3(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_ahrs3(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_AHRS3; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_AHRS3 - sysid:"+sysid+" compid:"+compid+" roll:"+roll+" pitch:"+pitch+" yaw:"+yaw+" altitude:"+altitude+" lat:"+lat+" lng:"+lng+" v1:"+v1+" v2:"+v2+" v3:"+v3+" v4:"+v4+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_AHRS3 - sysid:" + sysid + " compid:" + compid + " roll:" + roll + " pitch:" + pitch + " yaw:" + yaw + " altitude:" + altitude + " lat:" + lat + " lng:" + lng + " v1:" + v1 + " v2:" + v2 + " v3:" + v3 + " v4:" + v4 + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_airspeed_autocal.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_airspeed_autocal.java index bc17374..58437a0 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_airspeed_autocal.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_airspeed_autocal.java @@ -6,178 +6,178 @@ // MESSAGE AIRSPEED_AUTOCAL PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Airspeed auto-calibration. -*/ -public class msg_airspeed_autocal extends MAVLinkMessage{ + * Airspeed auto-calibration. + */ +public class msg_airspeed_autocal extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_AIRSPEED_AUTOCAL = 174; public static final int MAVLINK_MSG_LENGTH = 48; private static final long serialVersionUID = MAVLINK_MSG_ID_AIRSPEED_AUTOCAL; - /** - * GPS velocity north. - */ + * GPS velocity north. + */ public float vx; - - /** - * GPS velocity east. - */ - public float vy; - - /** - * GPS velocity down. - */ - public float vz; - - /** - * Differential pressure. - */ - public float diff_pressure; - - /** - * Estimated to true airspeed ratio. - */ - public float EAS2TAS; - - /** - * Airspeed ratio. - */ - public float ratio; - - /** - * EKF state x. - */ - public float state_x; - - /** - * EKF state y. - */ - public float state_y; - - /** - * EKF state z. - */ - public float state_z; - - /** - * EKF Pax. - */ - public float Pax; - - /** - * EKF Pby. - */ - public float Pby; - - /** - * EKF Pcz. - */ - public float Pcz; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * GPS velocity east. + */ + public float vy; + + /** + * GPS velocity down. + */ + public float vz; + + /** + * Differential pressure. + */ + public float diff_pressure; + + /** + * Estimated to true airspeed ratio. + */ + public float EAS2TAS; + + /** + * Airspeed ratio. + */ + public float ratio; + + /** + * EKF state x. + */ + public float state_x; + + /** + * EKF state y. + */ + public float state_y; + + /** + * EKF state z. + */ + public float state_z; + + /** + * EKF Pax. + */ + public float Pax; + + /** + * EKF Pby. + */ + public float Pby; + + /** + * EKF Pcz. + */ + public float Pcz; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_AIRSPEED_AUTOCAL; - + packet.payload.putFloat(vx); - + packet.payload.putFloat(vy); - + packet.payload.putFloat(vz); - + packet.payload.putFloat(diff_pressure); - + packet.payload.putFloat(EAS2TAS); - + packet.payload.putFloat(ratio); - + packet.payload.putFloat(state_x); - + packet.payload.putFloat(state_y); - + packet.payload.putFloat(state_z); - + packet.payload.putFloat(Pax); - + packet.payload.putFloat(Pby); - + packet.payload.putFloat(Pcz); - + return packet; } /** - * Decode a airspeed_autocal message into this class fields - * - * @param payload The message to decode - */ + * Decode a airspeed_autocal message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.vx = payload.getFloat(); - + this.vy = payload.getFloat(); - + this.vz = payload.getFloat(); - + this.diff_pressure = payload.getFloat(); - + this.EAS2TAS = payload.getFloat(); - + this.ratio = payload.getFloat(); - + this.state_x = payload.getFloat(); - + this.state_y = payload.getFloat(); - + this.state_z = payload.getFloat(); - + this.Pax = payload.getFloat(); - + this.Pby = payload.getFloat(); - + this.Pcz = payload.getFloat(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_airspeed_autocal(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_airspeed_autocal() { msgid = MAVLINK_MSG_ID_AIRSPEED_AUTOCAL; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_airspeed_autocal(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_airspeed_autocal(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_AIRSPEED_AUTOCAL; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_AIRSPEED_AUTOCAL - sysid:"+sysid+" compid:"+compid+" vx:"+vx+" vy:"+vy+" vz:"+vz+" diff_pressure:"+diff_pressure+" EAS2TAS:"+EAS2TAS+" ratio:"+ratio+" state_x:"+state_x+" state_y:"+state_y+" state_z:"+state_z+" Pax:"+Pax+" Pby:"+Pby+" Pcz:"+Pcz+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_AIRSPEED_AUTOCAL - sysid:" + sysid + " compid:" + compid + " vx:" + vx + " vy:" + vy + " vz:" + vz + " diff_pressure:" + diff_pressure + " EAS2TAS:" + EAS2TAS + " ratio:" + ratio + " state_x:" + state_x + " state_y:" + state_y + " state_z:" + state_z + " Pax:" + Pax + " Pby:" + Pby + " Pcz:" + Pcz + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_aoa_ssa.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_aoa_ssa.java index 87652fd..782152b 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_aoa_ssa.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_aoa_ssa.java @@ -6,97 +6,97 @@ // MESSAGE AOA_SSA PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Angle of Attack and Side Slip Angle. -*/ -public class msg_aoa_ssa extends MAVLinkMessage{ + * Angle of Attack and Side Slip Angle. + */ +public class msg_aoa_ssa extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_AOA_SSA = 11020; public static final int MAVLINK_MSG_LENGTH = 16; private static final long serialVersionUID = MAVLINK_MSG_ID_AOA_SSA; - /** - * Timestamp (since boot or Unix epoch). - */ + * Timestamp (since boot or Unix epoch). + */ public long time_usec; - - /** - * Angle of Attack. - */ - public float AOA; - - /** - * Side Slip Angle. - */ - public float SSA; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Angle of Attack. + */ + public float AOA; + + /** + * Side Slip Angle. + */ + public float SSA; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_AOA_SSA; - + packet.payload.putUnsignedLong(time_usec); - + packet.payload.putFloat(AOA); - + packet.payload.putFloat(SSA); - + return packet; } /** - * Decode a aoa_ssa message into this class fields - * - * @param payload The message to decode - */ + * Decode a aoa_ssa message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.time_usec = payload.getUnsignedLong(); - + this.AOA = payload.getFloat(); - + this.SSA = payload.getFloat(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_aoa_ssa(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_aoa_ssa() { msgid = MAVLINK_MSG_ID_AOA_SSA; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_aoa_ssa(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_aoa_ssa(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_AOA_SSA; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_AOA_SSA - sysid:"+sysid+" compid:"+compid+" time_usec:"+time_usec+" AOA:"+AOA+" SSA:"+SSA+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_AOA_SSA - sysid:" + sysid + " compid:" + compid + " time_usec:" + time_usec + " AOA:" + AOA + " SSA:" + SSA + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_ap_adc.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_ap_adc.java index 1530848..57518da 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_ap_adc.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_ap_adc.java @@ -6,124 +6,124 @@ // MESSAGE AP_ADC PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Raw ADC output. -*/ -public class msg_ap_adc extends MAVLinkMessage{ + * Raw ADC output. + */ +public class msg_ap_adc extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_AP_ADC = 153; public static final int MAVLINK_MSG_LENGTH = 12; private static final long serialVersionUID = MAVLINK_MSG_ID_AP_ADC; - /** - * ADC output 1. - */ + * ADC output 1. + */ public int adc1; - - /** - * ADC output 2. - */ - public int adc2; - - /** - * ADC output 3. - */ - public int adc3; - - /** - * ADC output 4. - */ - public int adc4; - - /** - * ADC output 5. - */ - public int adc5; - - /** - * ADC output 6. - */ - public int adc6; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * ADC output 2. + */ + public int adc2; + + /** + * ADC output 3. + */ + public int adc3; + + /** + * ADC output 4. + */ + public int adc4; + + /** + * ADC output 5. + */ + public int adc5; + + /** + * ADC output 6. + */ + public int adc6; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_AP_ADC; - + packet.payload.putUnsignedShort(adc1); - + packet.payload.putUnsignedShort(adc2); - + packet.payload.putUnsignedShort(adc3); - + packet.payload.putUnsignedShort(adc4); - + packet.payload.putUnsignedShort(adc5); - + packet.payload.putUnsignedShort(adc6); - + return packet; } /** - * Decode a ap_adc message into this class fields - * - * @param payload The message to decode - */ + * Decode a ap_adc message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.adc1 = payload.getUnsignedShort(); - + this.adc2 = payload.getUnsignedShort(); - + this.adc3 = payload.getUnsignedShort(); - + this.adc4 = payload.getUnsignedShort(); - + this.adc5 = payload.getUnsignedShort(); - + this.adc6 = payload.getUnsignedShort(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_ap_adc(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_ap_adc() { msgid = MAVLINK_MSG_ID_AP_ADC; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_ap_adc(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_ap_adc(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_AP_ADC; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_AP_ADC - sysid:"+sysid+" compid:"+compid+" adc1:"+adc1+" adc2:"+adc2+" adc3:"+adc3+" adc4:"+adc4+" adc5:"+adc5+" adc6:"+adc6+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_AP_ADC - sysid:" + sysid + " compid:" + compid + " adc1:" + adc1 + " adc2:" + adc2 + " adc3:" + adc3 + " adc4:" + adc4 + " adc5:" + adc5 + " adc6:" + adc6 + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_autopilot_version_request.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_autopilot_version_request.java index 96d7b94..0d07178 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_autopilot_version_request.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_autopilot_version_request.java @@ -6,88 +6,88 @@ // MESSAGE AUTOPILOT_VERSION_REQUEST PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Request the autopilot version from the system/component. -*/ -public class msg_autopilot_version_request extends MAVLinkMessage{ + * Request the autopilot version from the system/component. + */ +public class msg_autopilot_version_request extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_AUTOPILOT_VERSION_REQUEST = 183; public static final int MAVLINK_MSG_LENGTH = 2; private static final long serialVersionUID = MAVLINK_MSG_ID_AUTOPILOT_VERSION_REQUEST; - /** - * System ID. - */ + * System ID. + */ public short target_system; - - /** - * Component ID. - */ - public short target_component; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Component ID. + */ + public short target_component; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_AUTOPILOT_VERSION_REQUEST; - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + return packet; } /** - * Decode a autopilot_version_request message into this class fields - * - * @param payload The message to decode - */ + * Decode a autopilot_version_request message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_autopilot_version_request(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_autopilot_version_request() { msgid = MAVLINK_MSG_ID_AUTOPILOT_VERSION_REQUEST; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_autopilot_version_request(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_autopilot_version_request(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_AUTOPILOT_VERSION_REQUEST; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_AUTOPILOT_VERSION_REQUEST - sysid:"+sysid+" compid:"+compid+" target_system:"+target_system+" target_component:"+target_component+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_AUTOPILOT_VERSION_REQUEST - sysid:" + sysid + " compid:" + compid + " target_system:" + target_system + " target_component:" + target_component + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_battery2.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_battery2.java index 918371a..d84eb6e 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_battery2.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_battery2.java @@ -6,88 +6,88 @@ // MESSAGE BATTERY2 PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* 2nd Battery status -*/ -public class msg_battery2 extends MAVLinkMessage{ + * 2nd Battery status + */ +public class msg_battery2 extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_BATTERY2 = 181; public static final int MAVLINK_MSG_LENGTH = 4; private static final long serialVersionUID = MAVLINK_MSG_ID_BATTERY2; - /** - * Voltage. - */ + * Voltage. + */ public int voltage; - - /** - * Battery current, -1: autopilot does not measure the current. - */ - public short current_battery; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Battery current, -1: autopilot does not measure the current. + */ + public short current_battery; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_BATTERY2; - + packet.payload.putUnsignedShort(voltage); - + packet.payload.putShort(current_battery); - + return packet; } /** - * Decode a battery2 message into this class fields - * - * @param payload The message to decode - */ + * Decode a battery2 message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.voltage = payload.getUnsignedShort(); - + this.current_battery = payload.getShort(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_battery2(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_battery2() { msgid = MAVLINK_MSG_ID_BATTERY2; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_battery2(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_battery2(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_BATTERY2; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_BATTERY2 - sysid:"+sysid+" compid:"+compid+" voltage:"+voltage+" current_battery:"+current_battery+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_BATTERY2 - sysid:" + sysid + " compid:" + compid + " voltage:" + voltage + " current_battery:" + current_battery + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_camera_feedback.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_camera_feedback.java index f0adc75..9b8b41b 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_camera_feedback.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_camera_feedback.java @@ -6,196 +6,196 @@ // MESSAGE CAMERA_FEEDBACK PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Camera Capture Feedback. -*/ -public class msg_camera_feedback extends MAVLinkMessage{ + * Camera Capture Feedback. + */ +public class msg_camera_feedback extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_CAMERA_FEEDBACK = 180; public static final int MAVLINK_MSG_LENGTH = 47; private static final long serialVersionUID = MAVLINK_MSG_ID_CAMERA_FEEDBACK; - /** - * Image timestamp (since UNIX epoch), as passed in by CAMERA_STATUS message (or autopilot if no CCB). - */ + * Image timestamp (since UNIX epoch), as passed in by CAMERA_STATUS message (or autopilot if no CCB). + */ public long time_usec; - - /** - * Latitude. - */ - public int lat; - - /** - * Longitude. - */ - public int lng; - - /** - * Altitude (MSL). - */ - public float alt_msl; - - /** - * Altitude (Relative to HOME location). - */ - public float alt_rel; - - /** - * Camera Roll angle (earth frame, +-180). - */ - public float roll; - - /** - * Camera Pitch angle (earth frame, +-180). - */ - public float pitch; - - /** - * Camera Yaw (earth frame, 0-360, true). - */ - public float yaw; - - /** - * Focal Length. - */ - public float foc_len; - - /** - * Image index. - */ - public int img_idx; - - /** - * System ID. - */ - public short target_system; - - /** - * Camera ID. - */ - public short cam_idx; - - /** - * Feedback flags. - */ - public short flags; - - /** - * Completed image captures. - */ - public int completed_captures; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Latitude. + */ + public int lat; + + /** + * Longitude. + */ + public int lng; + + /** + * Altitude (MSL). + */ + public float alt_msl; + + /** + * Altitude (Relative to HOME location). + */ + public float alt_rel; + + /** + * Camera Roll angle (earth frame, +-180). + */ + public float roll; + + /** + * Camera Pitch angle (earth frame, +-180). + */ + public float pitch; + + /** + * Camera Yaw (earth frame, 0-360, true). + */ + public float yaw; + + /** + * Focal Length. + */ + public float foc_len; + + /** + * Image index. + */ + public int img_idx; + + /** + * System ID. + */ + public short target_system; + + /** + * Camera ID. + */ + public short cam_idx; + + /** + * Feedback flags. + */ + public short flags; + + /** + * Completed image captures. + */ + public int completed_captures; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_CAMERA_FEEDBACK; - + packet.payload.putUnsignedLong(time_usec); - + packet.payload.putInt(lat); - + packet.payload.putInt(lng); - + packet.payload.putFloat(alt_msl); - + packet.payload.putFloat(alt_rel); - + packet.payload.putFloat(roll); - + packet.payload.putFloat(pitch); - + packet.payload.putFloat(yaw); - + packet.payload.putFloat(foc_len); - + packet.payload.putUnsignedShort(img_idx); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(cam_idx); - + packet.payload.putUnsignedByte(flags); - + packet.payload.putUnsignedShort(completed_captures); - + return packet; } /** - * Decode a camera_feedback message into this class fields - * - * @param payload The message to decode - */ + * Decode a camera_feedback message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.time_usec = payload.getUnsignedLong(); - + this.lat = payload.getInt(); - + this.lng = payload.getInt(); - + this.alt_msl = payload.getFloat(); - + this.alt_rel = payload.getFloat(); - + this.roll = payload.getFloat(); - + this.pitch = payload.getFloat(); - + this.yaw = payload.getFloat(); - + this.foc_len = payload.getFloat(); - + this.img_idx = payload.getUnsignedShort(); - + this.target_system = payload.getUnsignedByte(); - + this.cam_idx = payload.getUnsignedByte(); - + this.flags = payload.getUnsignedByte(); - + this.completed_captures = payload.getUnsignedShort(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_camera_feedback(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_camera_feedback() { msgid = MAVLINK_MSG_ID_CAMERA_FEEDBACK; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_camera_feedback(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_camera_feedback(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_CAMERA_FEEDBACK; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_CAMERA_FEEDBACK - sysid:"+sysid+" compid:"+compid+" time_usec:"+time_usec+" lat:"+lat+" lng:"+lng+" alt_msl:"+alt_msl+" alt_rel:"+alt_rel+" roll:"+roll+" pitch:"+pitch+" yaw:"+yaw+" foc_len:"+foc_len+" img_idx:"+img_idx+" target_system:"+target_system+" cam_idx:"+cam_idx+" flags:"+flags+" completed_captures:"+completed_captures+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_CAMERA_FEEDBACK - sysid:" + sysid + " compid:" + compid + " time_usec:" + time_usec + " lat:" + lat + " lng:" + lng + " alt_msl:" + alt_msl + " alt_rel:" + alt_rel + " roll:" + roll + " pitch:" + pitch + " yaw:" + yaw + " foc_len:" + foc_len + " img_idx:" + img_idx + " target_system:" + target_system + " cam_idx:" + cam_idx + " flags:" + flags + " completed_captures:" + completed_captures + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_camera_status.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_camera_status.java index 91b612b..507e2ab 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_camera_status.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_camera_status.java @@ -6,151 +6,151 @@ // MESSAGE CAMERA_STATUS PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Camera Event. -*/ -public class msg_camera_status extends MAVLinkMessage{ + * Camera Event. + */ +public class msg_camera_status extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_CAMERA_STATUS = 179; public static final int MAVLINK_MSG_LENGTH = 29; private static final long serialVersionUID = MAVLINK_MSG_ID_CAMERA_STATUS; - /** - * Image timestamp (since UNIX epoch, according to camera clock). - */ + * Image timestamp (since UNIX epoch, according to camera clock). + */ public long time_usec; - - /** - * Parameter 1 (meaning depends on event_id, see CAMERA_STATUS_TYPES enum). - */ - public float p1; - - /** - * Parameter 2 (meaning depends on event_id, see CAMERA_STATUS_TYPES enum). - */ - public float p2; - - /** - * Parameter 3 (meaning depends on event_id, see CAMERA_STATUS_TYPES enum). - */ - public float p3; - - /** - * Parameter 4 (meaning depends on event_id, see CAMERA_STATUS_TYPES enum). - */ - public float p4; - - /** - * Image index. - */ - public int img_idx; - - /** - * System ID. - */ - public short target_system; - - /** - * Camera ID. - */ - public short cam_idx; - - /** - * Event type. - */ - public short event_id; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Parameter 1 (meaning depends on event_id, see CAMERA_STATUS_TYPES enum). + */ + public float p1; + + /** + * Parameter 2 (meaning depends on event_id, see CAMERA_STATUS_TYPES enum). + */ + public float p2; + + /** + * Parameter 3 (meaning depends on event_id, see CAMERA_STATUS_TYPES enum). + */ + public float p3; + + /** + * Parameter 4 (meaning depends on event_id, see CAMERA_STATUS_TYPES enum). + */ + public float p4; + + /** + * Image index. + */ + public int img_idx; + + /** + * System ID. + */ + public short target_system; + + /** + * Camera ID. + */ + public short cam_idx; + + /** + * Event type. + */ + public short event_id; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_CAMERA_STATUS; - + packet.payload.putUnsignedLong(time_usec); - + packet.payload.putFloat(p1); - + packet.payload.putFloat(p2); - + packet.payload.putFloat(p3); - + packet.payload.putFloat(p4); - + packet.payload.putUnsignedShort(img_idx); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(cam_idx); - + packet.payload.putUnsignedByte(event_id); - + return packet; } /** - * Decode a camera_status message into this class fields - * - * @param payload The message to decode - */ + * Decode a camera_status message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.time_usec = payload.getUnsignedLong(); - + this.p1 = payload.getFloat(); - + this.p2 = payload.getFloat(); - + this.p3 = payload.getFloat(); - + this.p4 = payload.getFloat(); - + this.img_idx = payload.getUnsignedShort(); - + this.target_system = payload.getUnsignedByte(); - + this.cam_idx = payload.getUnsignedByte(); - + this.event_id = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_camera_status(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_camera_status() { msgid = MAVLINK_MSG_ID_CAMERA_STATUS; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_camera_status(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_camera_status(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_CAMERA_STATUS; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_CAMERA_STATUS - sysid:"+sysid+" compid:"+compid+" time_usec:"+time_usec+" p1:"+p1+" p2:"+p2+" p3:"+p3+" p4:"+p4+" img_idx:"+img_idx+" target_system:"+target_system+" cam_idx:"+cam_idx+" event_id:"+event_id+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_CAMERA_STATUS - sysid:" + sysid + " compid:" + compid + " time_usec:" + time_usec + " p1:" + p1 + " p2:" + p2 + " p3:" + p3 + " p4:" + p4 + " img_idx:" + img_idx + " target_system:" + target_system + " cam_idx:" + cam_idx + " event_id:" + event_id + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_compassmot_status.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_compassmot_status.java index 04e611c..6003025 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_compassmot_status.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_compassmot_status.java @@ -6,124 +6,124 @@ // MESSAGE COMPASSMOT_STATUS PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Status of compassmot calibration. -*/ -public class msg_compassmot_status extends MAVLinkMessage{ + * Status of compassmot calibration. + */ +public class msg_compassmot_status extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_COMPASSMOT_STATUS = 177; public static final int MAVLINK_MSG_LENGTH = 20; private static final long serialVersionUID = MAVLINK_MSG_ID_COMPASSMOT_STATUS; - /** - * Current. - */ + * Current. + */ public float current; - - /** - * Motor Compensation X. - */ - public float CompensationX; - - /** - * Motor Compensation Y. - */ - public float CompensationY; - - /** - * Motor Compensation Z. - */ - public float CompensationZ; - - /** - * Throttle. - */ - public int throttle; - - /** - * Interference. - */ - public int interference; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Motor Compensation X. + */ + public float CompensationX; + + /** + * Motor Compensation Y. + */ + public float CompensationY; + + /** + * Motor Compensation Z. + */ + public float CompensationZ; + + /** + * Throttle. + */ + public int throttle; + + /** + * Interference. + */ + public int interference; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_COMPASSMOT_STATUS; - + packet.payload.putFloat(current); - + packet.payload.putFloat(CompensationX); - + packet.payload.putFloat(CompensationY); - + packet.payload.putFloat(CompensationZ); - + packet.payload.putUnsignedShort(throttle); - + packet.payload.putUnsignedShort(interference); - + return packet; } /** - * Decode a compassmot_status message into this class fields - * - * @param payload The message to decode - */ + * Decode a compassmot_status message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.current = payload.getFloat(); - + this.CompensationX = payload.getFloat(); - + this.CompensationY = payload.getFloat(); - + this.CompensationZ = payload.getFloat(); - + this.throttle = payload.getUnsignedShort(); - + this.interference = payload.getUnsignedShort(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_compassmot_status(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_compassmot_status() { msgid = MAVLINK_MSG_ID_COMPASSMOT_STATUS; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_compassmot_status(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_compassmot_status(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_COMPASSMOT_STATUS; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_COMPASSMOT_STATUS - sysid:"+sysid+" compid:"+compid+" current:"+current+" CompensationX:"+CompensationX+" CompensationY:"+CompensationY+" CompensationZ:"+CompensationZ+" throttle:"+throttle+" interference:"+interference+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_COMPASSMOT_STATUS - sysid:" + sysid + " compid:" + compid + " current:" + current + " CompensationX:" + CompensationX + " CompensationY:" + CompensationY + " CompensationZ:" + CompensationZ + " throttle:" + throttle + " interference:" + interference + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_data16.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_data16.java index 3bc801b..cb8183e 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_data16.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_data16.java @@ -6,105 +6,105 @@ // MESSAGE DATA16 PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Data packet, size 16. -*/ -public class msg_data16 extends MAVLinkMessage{ + * Data packet, size 16. + */ +public class msg_data16 extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_DATA16 = 169; public static final int MAVLINK_MSG_LENGTH = 18; private static final long serialVersionUID = MAVLINK_MSG_ID_DATA16; - /** - * Data type. - */ + * Data type. + */ public short type; - - /** - * Data length. - */ - public short len; - - /** - * Raw data. - */ - public short data[] = new short[16]; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Data length. + */ + public short len; + + /** + * Raw data. + */ + public short data[] = new short[16]; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_DATA16; - + packet.payload.putUnsignedByte(type); - + packet.payload.putUnsignedByte(len); - - + + for (int i = 0; i < data.length; i++) { packet.payload.putUnsignedByte(data[i]); } - - + + return packet; } /** - * Decode a data16 message into this class fields - * - * @param payload The message to decode - */ + * Decode a data16 message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.type = payload.getUnsignedByte(); - + this.len = payload.getUnsignedByte(); - - + + for (int i = 0; i < this.data.length; i++) { this.data[i] = payload.getUnsignedByte(); } - - + + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_data16(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_data16() { msgid = MAVLINK_MSG_ID_DATA16; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_data16(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_data16(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_DATA16; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_DATA16 - sysid:"+sysid+" compid:"+compid+" type:"+type+" len:"+len+" data:"+data+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_DATA16 - sysid:" + sysid + " compid:" + compid + " type:" + type + " len:" + len + " data:" + data + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_data32.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_data32.java index e1e3852..fab2513 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_data32.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_data32.java @@ -6,105 +6,105 @@ // MESSAGE DATA32 PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Data packet, size 32. -*/ -public class msg_data32 extends MAVLinkMessage{ + * Data packet, size 32. + */ +public class msg_data32 extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_DATA32 = 170; public static final int MAVLINK_MSG_LENGTH = 34; private static final long serialVersionUID = MAVLINK_MSG_ID_DATA32; - /** - * Data type. - */ + * Data type. + */ public short type; - - /** - * Data length. - */ - public short len; - - /** - * Raw data. - */ - public short data[] = new short[32]; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Data length. + */ + public short len; + + /** + * Raw data. + */ + public short data[] = new short[32]; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_DATA32; - + packet.payload.putUnsignedByte(type); - + packet.payload.putUnsignedByte(len); - - + + for (int i = 0; i < data.length; i++) { packet.payload.putUnsignedByte(data[i]); } - - + + return packet; } /** - * Decode a data32 message into this class fields - * - * @param payload The message to decode - */ + * Decode a data32 message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.type = payload.getUnsignedByte(); - + this.len = payload.getUnsignedByte(); - - + + for (int i = 0; i < this.data.length; i++) { this.data[i] = payload.getUnsignedByte(); } - - + + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_data32(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_data32() { msgid = MAVLINK_MSG_ID_DATA32; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_data32(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_data32(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_DATA32; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_DATA32 - sysid:"+sysid+" compid:"+compid+" type:"+type+" len:"+len+" data:"+data+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_DATA32 - sysid:" + sysid + " compid:" + compid + " type:" + type + " len:" + len + " data:" + data + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_data64.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_data64.java index 19da039..cbddee2 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_data64.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_data64.java @@ -6,105 +6,105 @@ // MESSAGE DATA64 PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Data packet, size 64. -*/ -public class msg_data64 extends MAVLinkMessage{ + * Data packet, size 64. + */ +public class msg_data64 extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_DATA64 = 171; public static final int MAVLINK_MSG_LENGTH = 66; private static final long serialVersionUID = MAVLINK_MSG_ID_DATA64; - /** - * Data type. - */ + * Data type. + */ public short type; - - /** - * Data length. - */ - public short len; - - /** - * Raw data. - */ - public short data[] = new short[64]; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Data length. + */ + public short len; + + /** + * Raw data. + */ + public short data[] = new short[64]; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_DATA64; - + packet.payload.putUnsignedByte(type); - + packet.payload.putUnsignedByte(len); - - + + for (int i = 0; i < data.length; i++) { packet.payload.putUnsignedByte(data[i]); } - - + + return packet; } /** - * Decode a data64 message into this class fields - * - * @param payload The message to decode - */ + * Decode a data64 message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.type = payload.getUnsignedByte(); - + this.len = payload.getUnsignedByte(); - - + + for (int i = 0; i < this.data.length; i++) { this.data[i] = payload.getUnsignedByte(); } - - + + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_data64(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_data64() { msgid = MAVLINK_MSG_ID_DATA64; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_data64(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_data64(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_DATA64; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_DATA64 - sysid:"+sysid+" compid:"+compid+" type:"+type+" len:"+len+" data:"+data+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_DATA64 - sysid:" + sysid + " compid:" + compid + " type:" + type + " len:" + len + " data:" + data + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_data96.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_data96.java index 7203904..1ec856e 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_data96.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_data96.java @@ -6,105 +6,105 @@ // MESSAGE DATA96 PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Data packet, size 96. -*/ -public class msg_data96 extends MAVLinkMessage{ + * Data packet, size 96. + */ +public class msg_data96 extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_DATA96 = 172; public static final int MAVLINK_MSG_LENGTH = 98; private static final long serialVersionUID = MAVLINK_MSG_ID_DATA96; - /** - * Data type. - */ + * Data type. + */ public short type; - - /** - * Data length. - */ - public short len; - - /** - * Raw data. - */ - public short data[] = new short[96]; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Data length. + */ + public short len; + + /** + * Raw data. + */ + public short data[] = new short[96]; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_DATA96; - + packet.payload.putUnsignedByte(type); - + packet.payload.putUnsignedByte(len); - - + + for (int i = 0; i < data.length; i++) { packet.payload.putUnsignedByte(data[i]); } - - + + return packet; } /** - * Decode a data96 message into this class fields - * - * @param payload The message to decode - */ + * Decode a data96 message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.type = payload.getUnsignedByte(); - + this.len = payload.getUnsignedByte(); - - + + for (int i = 0; i < this.data.length; i++) { this.data[i] = payload.getUnsignedByte(); } - - + + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_data96(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_data96() { msgid = MAVLINK_MSG_ID_DATA96; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_data96(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_data96(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_DATA96; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_DATA96 - sysid:"+sysid+" compid:"+compid+" type:"+type+" len:"+len+" data:"+data+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_DATA96 - sysid:" + sysid + " compid:" + compid + " type:" + type + " len:" + len + " data:" + data + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_deepstall.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_deepstall.java index d3b7c74..dde20f7 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_deepstall.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_deepstall.java @@ -6,160 +6,160 @@ // MESSAGE DEEPSTALL PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Deepstall path planning. -*/ -public class msg_deepstall extends MAVLinkMessage{ + * Deepstall path planning. + */ +public class msg_deepstall extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_DEEPSTALL = 195; public static final int MAVLINK_MSG_LENGTH = 37; private static final long serialVersionUID = MAVLINK_MSG_ID_DEEPSTALL; - /** - * Landing latitude. - */ + * Landing latitude. + */ public int landing_lat; - - /** - * Landing longitude. - */ - public int landing_lon; - - /** - * Final heading start point, latitude. - */ - public int path_lat; - - /** - * Final heading start point, longitude. - */ - public int path_lon; - - /** - * Arc entry point, latitude. - */ - public int arc_entry_lat; - - /** - * Arc entry point, longitude. - */ - public int arc_entry_lon; - - /** - * Altitude. - */ - public float altitude; - - /** - * Distance the aircraft expects to travel during the deepstall. - */ - public float expected_travel_distance; - - /** - * Deepstall cross track error (only valid when in DEEPSTALL_STAGE_LAND). - */ - public float cross_track_error; - - /** - * Deepstall stage. - */ - public short stage; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Landing longitude. + */ + public int landing_lon; + + /** + * Final heading start point, latitude. + */ + public int path_lat; + + /** + * Final heading start point, longitude. + */ + public int path_lon; + + /** + * Arc entry point, latitude. + */ + public int arc_entry_lat; + + /** + * Arc entry point, longitude. + */ + public int arc_entry_lon; + + /** + * Altitude. + */ + public float altitude; + + /** + * Distance the aircraft expects to travel during the deepstall. + */ + public float expected_travel_distance; + + /** + * Deepstall cross track error (only valid when in DEEPSTALL_STAGE_LAND). + */ + public float cross_track_error; + + /** + * Deepstall stage. + */ + public short stage; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_DEEPSTALL; - + packet.payload.putInt(landing_lat); - + packet.payload.putInt(landing_lon); - + packet.payload.putInt(path_lat); - + packet.payload.putInt(path_lon); - + packet.payload.putInt(arc_entry_lat); - + packet.payload.putInt(arc_entry_lon); - + packet.payload.putFloat(altitude); - + packet.payload.putFloat(expected_travel_distance); - + packet.payload.putFloat(cross_track_error); - + packet.payload.putUnsignedByte(stage); - + return packet; } /** - * Decode a deepstall message into this class fields - * - * @param payload The message to decode - */ + * Decode a deepstall message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.landing_lat = payload.getInt(); - + this.landing_lon = payload.getInt(); - + this.path_lat = payload.getInt(); - + this.path_lon = payload.getInt(); - + this.arc_entry_lat = payload.getInt(); - + this.arc_entry_lon = payload.getInt(); - + this.altitude = payload.getFloat(); - + this.expected_travel_distance = payload.getFloat(); - + this.cross_track_error = payload.getFloat(); - + this.stage = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_deepstall(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_deepstall() { msgid = MAVLINK_MSG_ID_DEEPSTALL; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_deepstall(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_deepstall(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_DEEPSTALL; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_DEEPSTALL - sysid:"+sysid+" compid:"+compid+" landing_lat:"+landing_lat+" landing_lon:"+landing_lon+" path_lat:"+path_lat+" path_lon:"+path_lon+" arc_entry_lat:"+arc_entry_lat+" arc_entry_lon:"+arc_entry_lon+" altitude:"+altitude+" expected_travel_distance:"+expected_travel_distance+" cross_track_error:"+cross_track_error+" stage:"+stage+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_DEEPSTALL - sysid:" + sysid + " compid:" + compid + " landing_lat:" + landing_lat + " landing_lon:" + landing_lon + " path_lat:" + path_lat + " path_lon:" + path_lon + " arc_entry_lat:" + arc_entry_lat + " arc_entry_lon:" + arc_entry_lon + " altitude:" + altitude + " expected_travel_distance:" + expected_travel_distance + " cross_track_error:" + cross_track_error + " stage:" + stage + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_device_op_read.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_device_op_read.java index 34b63e8..e9205d8 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_device_op_read.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_device_op_read.java @@ -6,171 +6,171 @@ // MESSAGE DEVICE_OP_READ PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Read registers for a device. -*/ -public class msg_device_op_read extends MAVLinkMessage{ + * Read registers for a device. + */ +public class msg_device_op_read extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_DEVICE_OP_READ = 11000; public static final int MAVLINK_MSG_LENGTH = 51; private static final long serialVersionUID = MAVLINK_MSG_ID_DEVICE_OP_READ; - /** - * Request ID - copied to reply. - */ + * Request ID - copied to reply. + */ public long request_id; - - /** - * System ID. - */ - public short target_system; - - /** - * Component ID. - */ - public short target_component; - - /** - * The bus type. - */ - public short bustype; - - /** - * Bus number. - */ - public short bus; - - /** - * Bus address. - */ - public short address; - - /** - * Name of device on bus (for SPI). - */ - public byte busname[] = new byte[40]; - - /** - * First register to read. - */ - public short regstart; - - /** - * Count of registers to read. - */ - public short count; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * System ID. + */ + public short target_system; + + /** + * Component ID. + */ + public short target_component; + + /** + * The bus type. + */ + public short bustype; + + /** + * Bus number. + */ + public short bus; + + /** + * Bus address. + */ + public short address; + + /** + * Name of device on bus (for SPI). + */ + public byte busname[] = new byte[40]; + + /** + * First register to read. + */ + public short regstart; + + /** + * Count of registers to read. + */ + public short count; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_DEVICE_OP_READ; - + packet.payload.putUnsignedInt(request_id); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + packet.payload.putUnsignedByte(bustype); - + packet.payload.putUnsignedByte(bus); - + packet.payload.putUnsignedByte(address); - - + + for (int i = 0; i < busname.length; i++) { packet.payload.putByte(busname[i]); } - - + + packet.payload.putUnsignedByte(regstart); - + packet.payload.putUnsignedByte(count); - + return packet; } /** - * Decode a device_op_read message into this class fields - * - * @param payload The message to decode - */ + * Decode a device_op_read message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.request_id = payload.getUnsignedInt(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + this.bustype = payload.getUnsignedByte(); - + this.bus = payload.getUnsignedByte(); - + this.address = payload.getUnsignedByte(); - - + + for (int i = 0; i < this.busname.length; i++) { this.busname[i] = payload.getByte(); } - - + + this.regstart = payload.getUnsignedByte(); - + this.count = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_device_op_read(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_device_op_read() { msgid = MAVLINK_MSG_ID_DEVICE_OP_READ; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_device_op_read(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_device_op_read(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_DEVICE_OP_READ; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Sets the buffer of this message with a string, adds the necessary padding - */ + * Sets the buffer of this message with a string, adds the necessary padding + */ public void setBusname(String str) { int len = Math.min(str.length(), 40); - for (int i=0; i MAV. Also used to return a point from MAV -> GCS. -*/ -public class msg_fence_point extends MAVLinkMessage{ + * A fence point. Used to set a point when from GCS -> MAV. Also used to return a point from MAV -> GCS. + */ +public class msg_fence_point extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_FENCE_POINT = 160; public static final int MAVLINK_MSG_LENGTH = 12; private static final long serialVersionUID = MAVLINK_MSG_ID_FENCE_POINT; - /** - * Latitude of point. - */ + * Latitude of point. + */ public float lat; - - /** - * Longitude of point. - */ - public float lng; - - /** - * System ID. - */ - public short target_system; - - /** - * Component ID. - */ - public short target_component; - - /** - * Point index (first point is 1, 0 is for return point). - */ - public short idx; - - /** - * Total number of points (for sanity checking). - */ - public short count; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Longitude of point. + */ + public float lng; + + /** + * System ID. + */ + public short target_system; + + /** + * Component ID. + */ + public short target_component; + + /** + * Point index (first point is 1, 0 is for return point). + */ + public short idx; + + /** + * Total number of points (for sanity checking). + */ + public short count; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_FENCE_POINT; - + packet.payload.putFloat(lat); - + packet.payload.putFloat(lng); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + packet.payload.putUnsignedByte(idx); - + packet.payload.putUnsignedByte(count); - + return packet; } /** - * Decode a fence_point message into this class fields - * - * @param payload The message to decode - */ + * Decode a fence_point message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.lat = payload.getFloat(); - + this.lng = payload.getFloat(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + this.idx = payload.getUnsignedByte(); - + this.count = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_fence_point(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_fence_point() { msgid = MAVLINK_MSG_ID_FENCE_POINT; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_fence_point(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_fence_point(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_FENCE_POINT; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_FENCE_POINT - sysid:"+sysid+" compid:"+compid+" lat:"+lat+" lng:"+lng+" target_system:"+target_system+" target_component:"+target_component+" idx:"+idx+" count:"+count+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_FENCE_POINT - sysid:" + sysid + " compid:" + compid + " lat:" + lat + " lng:" + lng + " target_system:" + target_system + " target_component:" + target_component + " idx:" + idx + " count:" + count + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_gimbal_control.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_gimbal_control.java index 784ad62..db760fc 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_gimbal_control.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_gimbal_control.java @@ -6,115 +6,115 @@ // MESSAGE GIMBAL_CONTROL PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Control message for rate gimbal. -*/ -public class msg_gimbal_control extends MAVLinkMessage{ + * Control message for rate gimbal. + */ +public class msg_gimbal_control extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_GIMBAL_CONTROL = 201; public static final int MAVLINK_MSG_LENGTH = 14; private static final long serialVersionUID = MAVLINK_MSG_ID_GIMBAL_CONTROL; - /** - * Demanded angular rate X. - */ + * Demanded angular rate X. + */ public float demanded_rate_x; - - /** - * Demanded angular rate Y. - */ - public float demanded_rate_y; - - /** - * Demanded angular rate Z. - */ - public float demanded_rate_z; - - /** - * System ID. - */ - public short target_system; - - /** - * Component ID. - */ - public short target_component; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Demanded angular rate Y. + */ + public float demanded_rate_y; + + /** + * Demanded angular rate Z. + */ + public float demanded_rate_z; + + /** + * System ID. + */ + public short target_system; + + /** + * Component ID. + */ + public short target_component; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_GIMBAL_CONTROL; - + packet.payload.putFloat(demanded_rate_x); - + packet.payload.putFloat(demanded_rate_y); - + packet.payload.putFloat(demanded_rate_z); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + return packet; } /** - * Decode a gimbal_control message into this class fields - * - * @param payload The message to decode - */ + * Decode a gimbal_control message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.demanded_rate_x = payload.getFloat(); - + this.demanded_rate_y = payload.getFloat(); - + this.demanded_rate_z = payload.getFloat(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_gimbal_control(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_gimbal_control() { msgid = MAVLINK_MSG_ID_GIMBAL_CONTROL; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_gimbal_control(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_gimbal_control(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_GIMBAL_CONTROL; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_GIMBAL_CONTROL - sysid:"+sysid+" compid:"+compid+" demanded_rate_x:"+demanded_rate_x+" demanded_rate_y:"+demanded_rate_y+" demanded_rate_z:"+demanded_rate_z+" target_system:"+target_system+" target_component:"+target_component+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_GIMBAL_CONTROL - sysid:" + sysid + " compid:" + compid + " demanded_rate_x:" + demanded_rate_x + " demanded_rate_y:" + demanded_rate_y + " demanded_rate_z:" + demanded_rate_z + " target_system:" + target_system + " target_component:" + target_component + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_gimbal_report.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_gimbal_report.java index 0c336eb..80c1d29 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_gimbal_report.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_gimbal_report.java @@ -6,178 +6,178 @@ // MESSAGE GIMBAL_REPORT PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* 3 axis gimbal measurements. -*/ -public class msg_gimbal_report extends MAVLinkMessage{ + * 3 axis gimbal measurements. + */ +public class msg_gimbal_report extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_GIMBAL_REPORT = 200; public static final int MAVLINK_MSG_LENGTH = 42; private static final long serialVersionUID = MAVLINK_MSG_ID_GIMBAL_REPORT; - /** - * Time since last update. - */ + * Time since last update. + */ public float delta_time; - - /** - * Delta angle X. - */ - public float delta_angle_x; - - /** - * Delta angle Y. - */ - public float delta_angle_y; - - /** - * Delta angle X. - */ - public float delta_angle_z; - - /** - * Delta velocity X. - */ - public float delta_velocity_x; - - /** - * Delta velocity Y. - */ - public float delta_velocity_y; - - /** - * Delta velocity Z. - */ - public float delta_velocity_z; - - /** - * Joint ROLL. - */ - public float joint_roll; - - /** - * Joint EL. - */ - public float joint_el; - - /** - * Joint AZ. - */ - public float joint_az; - - /** - * System ID. - */ - public short target_system; - - /** - * Component ID. - */ - public short target_component; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Delta angle X. + */ + public float delta_angle_x; + + /** + * Delta angle Y. + */ + public float delta_angle_y; + + /** + * Delta angle X. + */ + public float delta_angle_z; + + /** + * Delta velocity X. + */ + public float delta_velocity_x; + + /** + * Delta velocity Y. + */ + public float delta_velocity_y; + + /** + * Delta velocity Z. + */ + public float delta_velocity_z; + + /** + * Joint ROLL. + */ + public float joint_roll; + + /** + * Joint EL. + */ + public float joint_el; + + /** + * Joint AZ. + */ + public float joint_az; + + /** + * System ID. + */ + public short target_system; + + /** + * Component ID. + */ + public short target_component; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_GIMBAL_REPORT; - + packet.payload.putFloat(delta_time); - + packet.payload.putFloat(delta_angle_x); - + packet.payload.putFloat(delta_angle_y); - + packet.payload.putFloat(delta_angle_z); - + packet.payload.putFloat(delta_velocity_x); - + packet.payload.putFloat(delta_velocity_y); - + packet.payload.putFloat(delta_velocity_z); - + packet.payload.putFloat(joint_roll); - + packet.payload.putFloat(joint_el); - + packet.payload.putFloat(joint_az); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + return packet; } /** - * Decode a gimbal_report message into this class fields - * - * @param payload The message to decode - */ + * Decode a gimbal_report message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.delta_time = payload.getFloat(); - + this.delta_angle_x = payload.getFloat(); - + this.delta_angle_y = payload.getFloat(); - + this.delta_angle_z = payload.getFloat(); - + this.delta_velocity_x = payload.getFloat(); - + this.delta_velocity_y = payload.getFloat(); - + this.delta_velocity_z = payload.getFloat(); - + this.joint_roll = payload.getFloat(); - + this.joint_el = payload.getFloat(); - + this.joint_az = payload.getFloat(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_gimbal_report(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_gimbal_report() { msgid = MAVLINK_MSG_ID_GIMBAL_REPORT; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_gimbal_report(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_gimbal_report(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_GIMBAL_REPORT; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_GIMBAL_REPORT - sysid:"+sysid+" compid:"+compid+" delta_time:"+delta_time+" delta_angle_x:"+delta_angle_x+" delta_angle_y:"+delta_angle_y+" delta_angle_z:"+delta_angle_z+" delta_velocity_x:"+delta_velocity_x+" delta_velocity_y:"+delta_velocity_y+" delta_velocity_z:"+delta_velocity_z+" joint_roll:"+joint_roll+" joint_el:"+joint_el+" joint_az:"+joint_az+" target_system:"+target_system+" target_component:"+target_component+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_GIMBAL_REPORT - sysid:" + sysid + " compid:" + compid + " delta_time:" + delta_time + " delta_angle_x:" + delta_angle_x + " delta_angle_y:" + delta_angle_y + " delta_angle_z:" + delta_angle_z + " delta_velocity_x:" + delta_velocity_x + " delta_velocity_y:" + delta_velocity_y + " delta_velocity_z:" + delta_velocity_z + " joint_roll:" + joint_roll + " joint_el:" + joint_el + " joint_az:" + joint_az + " target_system:" + target_system + " target_component:" + target_component + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_gimbal_torque_cmd_report.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_gimbal_torque_cmd_report.java index 2cf1603..905c723 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_gimbal_torque_cmd_report.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_gimbal_torque_cmd_report.java @@ -6,115 +6,115 @@ // MESSAGE GIMBAL_TORQUE_CMD_REPORT PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* 100 Hz gimbal torque command telemetry. -*/ -public class msg_gimbal_torque_cmd_report extends MAVLinkMessage{ + * 100 Hz gimbal torque command telemetry. + */ +public class msg_gimbal_torque_cmd_report extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_GIMBAL_TORQUE_CMD_REPORT = 214; public static final int MAVLINK_MSG_LENGTH = 8; private static final long serialVersionUID = MAVLINK_MSG_ID_GIMBAL_TORQUE_CMD_REPORT; - /** - * Roll Torque Command. - */ + * Roll Torque Command. + */ public short rl_torque_cmd; - - /** - * Elevation Torque Command. - */ - public short el_torque_cmd; - - /** - * Azimuth Torque Command. - */ - public short az_torque_cmd; - - /** - * System ID. - */ - public short target_system; - - /** - * Component ID. - */ - public short target_component; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Elevation Torque Command. + */ + public short el_torque_cmd; + + /** + * Azimuth Torque Command. + */ + public short az_torque_cmd; + + /** + * System ID. + */ + public short target_system; + + /** + * Component ID. + */ + public short target_component; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_GIMBAL_TORQUE_CMD_REPORT; - + packet.payload.putShort(rl_torque_cmd); - + packet.payload.putShort(el_torque_cmd); - + packet.payload.putShort(az_torque_cmd); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + return packet; } /** - * Decode a gimbal_torque_cmd_report message into this class fields - * - * @param payload The message to decode - */ + * Decode a gimbal_torque_cmd_report message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.rl_torque_cmd = payload.getShort(); - + this.el_torque_cmd = payload.getShort(); - + this.az_torque_cmd = payload.getShort(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_gimbal_torque_cmd_report(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_gimbal_torque_cmd_report() { msgid = MAVLINK_MSG_ID_GIMBAL_TORQUE_CMD_REPORT; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_gimbal_torque_cmd_report(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_gimbal_torque_cmd_report(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_GIMBAL_TORQUE_CMD_REPORT; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_GIMBAL_TORQUE_CMD_REPORT - sysid:"+sysid+" compid:"+compid+" rl_torque_cmd:"+rl_torque_cmd+" el_torque_cmd:"+el_torque_cmd+" az_torque_cmd:"+az_torque_cmd+" target_system:"+target_system+" target_component:"+target_component+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_GIMBAL_TORQUE_CMD_REPORT - sysid:" + sysid + " compid:" + compid + " rl_torque_cmd:" + rl_torque_cmd + " el_torque_cmd:" + el_torque_cmd + " az_torque_cmd:" + az_torque_cmd + " target_system:" + target_system + " target_component:" + target_component + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_gopro_get_request.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_gopro_get_request.java index 9839adc..d0b024f 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_gopro_get_request.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_gopro_get_request.java @@ -6,97 +6,97 @@ // MESSAGE GOPRO_GET_REQUEST PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Request a GOPRO_COMMAND response from the GoPro. -*/ -public class msg_gopro_get_request extends MAVLinkMessage{ + * Request a GOPRO_COMMAND response from the GoPro. + */ +public class msg_gopro_get_request extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_GOPRO_GET_REQUEST = 216; public static final int MAVLINK_MSG_LENGTH = 3; private static final long serialVersionUID = MAVLINK_MSG_ID_GOPRO_GET_REQUEST; - /** - * System ID. - */ + * System ID. + */ public short target_system; - - /** - * Component ID. - */ - public short target_component; - - /** - * Command ID. - */ - public short cmd_id; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Component ID. + */ + public short target_component; + + /** + * Command ID. + */ + public short cmd_id; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_GOPRO_GET_REQUEST; - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + packet.payload.putUnsignedByte(cmd_id); - + return packet; } /** - * Decode a gopro_get_request message into this class fields - * - * @param payload The message to decode - */ + * Decode a gopro_get_request message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + this.cmd_id = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_gopro_get_request(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_gopro_get_request() { msgid = MAVLINK_MSG_ID_GOPRO_GET_REQUEST; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_gopro_get_request(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_gopro_get_request(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_GOPRO_GET_REQUEST; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_GOPRO_GET_REQUEST - sysid:"+sysid+" compid:"+compid+" target_system:"+target_system+" target_component:"+target_component+" cmd_id:"+cmd_id+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_GOPRO_GET_REQUEST - sysid:" + sysid + " compid:" + compid + " target_system:" + target_system + " target_component:" + target_component + " cmd_id:" + cmd_id + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_gopro_get_response.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_gopro_get_response.java index 3665f18..b25c100 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_gopro_get_response.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_gopro_get_response.java @@ -6,105 +6,105 @@ // MESSAGE GOPRO_GET_RESPONSE PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Response from a GOPRO_COMMAND get request. -*/ -public class msg_gopro_get_response extends MAVLinkMessage{ + * Response from a GOPRO_COMMAND get request. + */ +public class msg_gopro_get_response extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_GOPRO_GET_RESPONSE = 217; public static final int MAVLINK_MSG_LENGTH = 6; private static final long serialVersionUID = MAVLINK_MSG_ID_GOPRO_GET_RESPONSE; - /** - * Command ID. - */ + * Command ID. + */ public short cmd_id; - - /** - * Status. - */ - public short status; - - /** - * Value. - */ - public short value[] = new short[4]; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Status. + */ + public short status; + + /** + * Value. + */ + public short value[] = new short[4]; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_GOPRO_GET_RESPONSE; - + packet.payload.putUnsignedByte(cmd_id); - + packet.payload.putUnsignedByte(status); - - + + for (int i = 0; i < value.length; i++) { packet.payload.putUnsignedByte(value[i]); } - - + + return packet; } /** - * Decode a gopro_get_response message into this class fields - * - * @param payload The message to decode - */ + * Decode a gopro_get_response message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.cmd_id = payload.getUnsignedByte(); - + this.status = payload.getUnsignedByte(); - - + + for (int i = 0; i < this.value.length; i++) { this.value[i] = payload.getUnsignedByte(); } - - + + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_gopro_get_response(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_gopro_get_response() { msgid = MAVLINK_MSG_ID_GOPRO_GET_RESPONSE; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_gopro_get_response(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_gopro_get_response(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_GOPRO_GET_RESPONSE; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_GOPRO_GET_RESPONSE - sysid:"+sysid+" compid:"+compid+" cmd_id:"+cmd_id+" status:"+status+" value:"+value+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_GOPRO_GET_RESPONSE - sysid:" + sysid + " compid:" + compid + " cmd_id:" + cmd_id + " status:" + status + " value:" + value + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_gopro_heartbeat.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_gopro_heartbeat.java index 6b9650c..a14ce38 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_gopro_heartbeat.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_gopro_heartbeat.java @@ -6,97 +6,97 @@ // MESSAGE GOPRO_HEARTBEAT PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Heartbeat from a HeroBus attached GoPro. -*/ -public class msg_gopro_heartbeat extends MAVLinkMessage{ + * Heartbeat from a HeroBus attached GoPro. + */ +public class msg_gopro_heartbeat extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_GOPRO_HEARTBEAT = 215; public static final int MAVLINK_MSG_LENGTH = 3; private static final long serialVersionUID = MAVLINK_MSG_ID_GOPRO_HEARTBEAT; - /** - * Status. - */ + * Status. + */ public short status; - - /** - * Current capture mode. - */ - public short capture_mode; - - /** - * Additional status bits. - */ - public short flags; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Current capture mode. + */ + public short capture_mode; + + /** + * Additional status bits. + */ + public short flags; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_GOPRO_HEARTBEAT; - + packet.payload.putUnsignedByte(status); - + packet.payload.putUnsignedByte(capture_mode); - + packet.payload.putUnsignedByte(flags); - + return packet; } /** - * Decode a gopro_heartbeat message into this class fields - * - * @param payload The message to decode - */ + * Decode a gopro_heartbeat message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.status = payload.getUnsignedByte(); - + this.capture_mode = payload.getUnsignedByte(); - + this.flags = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_gopro_heartbeat(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_gopro_heartbeat() { msgid = MAVLINK_MSG_ID_GOPRO_HEARTBEAT; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_gopro_heartbeat(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_gopro_heartbeat(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_GOPRO_HEARTBEAT; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_GOPRO_HEARTBEAT - sysid:"+sysid+" compid:"+compid+" status:"+status+" capture_mode:"+capture_mode+" flags:"+flags+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_GOPRO_HEARTBEAT - sysid:" + sysid + " compid:" + compid + " status:" + status + " capture_mode:" + capture_mode + " flags:" + flags + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_gopro_set_request.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_gopro_set_request.java index 9e4b281..36ab80b 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_gopro_set_request.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_gopro_set_request.java @@ -6,114 +6,114 @@ // MESSAGE GOPRO_SET_REQUEST PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Request to set a GOPRO_COMMAND with a desired. -*/ -public class msg_gopro_set_request extends MAVLinkMessage{ + * Request to set a GOPRO_COMMAND with a desired. + */ +public class msg_gopro_set_request extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_GOPRO_SET_REQUEST = 218; public static final int MAVLINK_MSG_LENGTH = 7; private static final long serialVersionUID = MAVLINK_MSG_ID_GOPRO_SET_REQUEST; - /** - * System ID. - */ + * System ID. + */ public short target_system; - - /** - * Component ID. - */ - public short target_component; - - /** - * Command ID. - */ - public short cmd_id; - - /** - * Value. - */ - public short value[] = new short[4]; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Component ID. + */ + public short target_component; + + /** + * Command ID. + */ + public short cmd_id; + + /** + * Value. + */ + public short value[] = new short[4]; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_GOPRO_SET_REQUEST; - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + packet.payload.putUnsignedByte(cmd_id); - - + + for (int i = 0; i < value.length; i++) { packet.payload.putUnsignedByte(value[i]); } - - + + return packet; } /** - * Decode a gopro_set_request message into this class fields - * - * @param payload The message to decode - */ + * Decode a gopro_set_request message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + this.cmd_id = payload.getUnsignedByte(); - - + + for (int i = 0; i < this.value.length; i++) { this.value[i] = payload.getUnsignedByte(); } - - + + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_gopro_set_request(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_gopro_set_request() { msgid = MAVLINK_MSG_ID_GOPRO_SET_REQUEST; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_gopro_set_request(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_gopro_set_request(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_GOPRO_SET_REQUEST; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_GOPRO_SET_REQUEST - sysid:"+sysid+" compid:"+compid+" target_system:"+target_system+" target_component:"+target_component+" cmd_id:"+cmd_id+" value:"+value+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_GOPRO_SET_REQUEST - sysid:" + sysid + " compid:" + compid + " target_system:" + target_system + " target_component:" + target_component + " cmd_id:" + cmd_id + " value:" + value + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_gopro_set_response.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_gopro_set_response.java index 0fb73e3..9132cdc 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_gopro_set_response.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_gopro_set_response.java @@ -6,88 +6,88 @@ // MESSAGE GOPRO_SET_RESPONSE PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Response from a GOPRO_COMMAND set request. -*/ -public class msg_gopro_set_response extends MAVLinkMessage{ + * Response from a GOPRO_COMMAND set request. + */ +public class msg_gopro_set_response extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_GOPRO_SET_RESPONSE = 219; public static final int MAVLINK_MSG_LENGTH = 2; private static final long serialVersionUID = MAVLINK_MSG_ID_GOPRO_SET_RESPONSE; - /** - * Command ID. - */ + * Command ID. + */ public short cmd_id; - - /** - * Status. - */ - public short status; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Status. + */ + public short status; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_GOPRO_SET_RESPONSE; - + packet.payload.putUnsignedByte(cmd_id); - + packet.payload.putUnsignedByte(status); - + return packet; } /** - * Decode a gopro_set_response message into this class fields - * - * @param payload The message to decode - */ + * Decode a gopro_set_response message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.cmd_id = payload.getUnsignedByte(); - + this.status = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_gopro_set_response(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_gopro_set_response() { msgid = MAVLINK_MSG_ID_GOPRO_SET_RESPONSE; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_gopro_set_response(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_gopro_set_response(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_GOPRO_SET_RESPONSE; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_GOPRO_SET_RESPONSE - sysid:"+sysid+" compid:"+compid+" cmd_id:"+cmd_id+" status:"+status+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_GOPRO_SET_RESPONSE - sysid:" + sysid + " compid:" + compid + " cmd_id:" + cmd_id + " status:" + status + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_hwstatus.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_hwstatus.java index b331c89..9c37b2a 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_hwstatus.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_hwstatus.java @@ -6,88 +6,88 @@ // MESSAGE HWSTATUS PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Status of key hardware. -*/ -public class msg_hwstatus extends MAVLinkMessage{ + * Status of key hardware. + */ +public class msg_hwstatus extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_HWSTATUS = 165; public static final int MAVLINK_MSG_LENGTH = 3; private static final long serialVersionUID = MAVLINK_MSG_ID_HWSTATUS; - /** - * Board voltage. - */ + * Board voltage. + */ public int Vcc; - - /** - * I2C error count. - */ - public short I2Cerr; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * I2C error count. + */ + public short I2Cerr; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_HWSTATUS; - + packet.payload.putUnsignedShort(Vcc); - + packet.payload.putUnsignedByte(I2Cerr); - + return packet; } /** - * Decode a hwstatus message into this class fields - * - * @param payload The message to decode - */ + * Decode a hwstatus message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.Vcc = payload.getUnsignedShort(); - + this.I2Cerr = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_hwstatus(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_hwstatus() { msgid = MAVLINK_MSG_ID_HWSTATUS; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_hwstatus(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_hwstatus(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_HWSTATUS; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_HWSTATUS - sysid:"+sysid+" compid:"+compid+" Vcc:"+Vcc+" I2Cerr:"+I2Cerr+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_HWSTATUS - sysid:" + sysid + " compid:" + compid + " Vcc:" + Vcc + " I2Cerr:" + I2Cerr + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_led_control.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_led_control.java index 8bcb732..c2f5e9a 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_led_control.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_led_control.java @@ -6,132 +6,132 @@ // MESSAGE LED_CONTROL PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Control vehicle LEDs. -*/ -public class msg_led_control extends MAVLinkMessage{ + * Control vehicle LEDs. + */ +public class msg_led_control extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_LED_CONTROL = 186; public static final int MAVLINK_MSG_LENGTH = 29; private static final long serialVersionUID = MAVLINK_MSG_ID_LED_CONTROL; - /** - * System ID. - */ + * System ID. + */ public short target_system; - - /** - * Component ID. - */ - public short target_component; - - /** - * Instance (LED instance to control or 255 for all LEDs). - */ - public short instance; - - /** - * Pattern (see LED_PATTERN_ENUM). - */ - public short pattern; - - /** - * Custom Byte Length. - */ - public short custom_len; - - /** - * Custom Bytes. - */ - public short custom_bytes[] = new short[24]; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Component ID. + */ + public short target_component; + + /** + * Instance (LED instance to control or 255 for all LEDs). + */ + public short instance; + + /** + * Pattern (see LED_PATTERN_ENUM). + */ + public short pattern; + + /** + * Custom Byte Length. + */ + public short custom_len; + + /** + * Custom Bytes. + */ + public short custom_bytes[] = new short[24]; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_LED_CONTROL; - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + packet.payload.putUnsignedByte(instance); - + packet.payload.putUnsignedByte(pattern); - + packet.payload.putUnsignedByte(custom_len); - - + + for (int i = 0; i < custom_bytes.length; i++) { packet.payload.putUnsignedByte(custom_bytes[i]); } - - + + return packet; } /** - * Decode a led_control message into this class fields - * - * @param payload The message to decode - */ + * Decode a led_control message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + this.instance = payload.getUnsignedByte(); - + this.pattern = payload.getUnsignedByte(); - + this.custom_len = payload.getUnsignedByte(); - - + + for (int i = 0; i < this.custom_bytes.length; i++) { this.custom_bytes[i] = payload.getUnsignedByte(); } - - + + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_led_control(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_led_control() { msgid = MAVLINK_MSG_ID_LED_CONTROL; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_led_control(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_led_control(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_LED_CONTROL; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_LED_CONTROL - sysid:"+sysid+" compid:"+compid+" target_system:"+target_system+" target_component:"+target_component+" instance:"+instance+" pattern:"+pattern+" custom_len:"+custom_len+" custom_bytes:"+custom_bytes+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_LED_CONTROL - sysid:" + sysid + " compid:" + compid + " target_system:" + target_system + " target_component:" + target_component + " instance:" + instance + " pattern:" + pattern + " custom_len:" + custom_len + " custom_bytes:" + custom_bytes + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_limits_status.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_limits_status.java index 3735204..d1b2640 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_limits_status.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_limits_status.java @@ -6,151 +6,151 @@ // MESSAGE LIMITS_STATUS PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Status of AP_Limits. Sent in extended status stream when AP_Limits is enabled. -*/ -public class msg_limits_status extends MAVLinkMessage{ + * Status of AP_Limits. Sent in extended status stream when AP_Limits is enabled. + */ +public class msg_limits_status extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_LIMITS_STATUS = 167; public static final int MAVLINK_MSG_LENGTH = 22; private static final long serialVersionUID = MAVLINK_MSG_ID_LIMITS_STATUS; - /** - * Time (since boot) of last breach. - */ + * Time (since boot) of last breach. + */ public long last_trigger; - - /** - * Time (since boot) of last recovery action. - */ - public long last_action; - - /** - * Time (since boot) of last successful recovery. - */ - public long last_recovery; - - /** - * Time (since boot) of last all-clear. - */ - public long last_clear; - - /** - * Number of fence breaches. - */ - public int breach_count; - - /** - * State of AP_Limits. - */ - public short limits_state; - - /** - * AP_Limit_Module bitfield of enabled modules. - */ - public short mods_enabled; - - /** - * AP_Limit_Module bitfield of required modules. - */ - public short mods_required; - - /** - * AP_Limit_Module bitfield of triggered modules. - */ - public short mods_triggered; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Time (since boot) of last recovery action. + */ + public long last_action; + + /** + * Time (since boot) of last successful recovery. + */ + public long last_recovery; + + /** + * Time (since boot) of last all-clear. + */ + public long last_clear; + + /** + * Number of fence breaches. + */ + public int breach_count; + + /** + * State of AP_Limits. + */ + public short limits_state; + + /** + * AP_Limit_Module bitfield of enabled modules. + */ + public short mods_enabled; + + /** + * AP_Limit_Module bitfield of required modules. + */ + public short mods_required; + + /** + * AP_Limit_Module bitfield of triggered modules. + */ + public short mods_triggered; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_LIMITS_STATUS; - + packet.payload.putUnsignedInt(last_trigger); - + packet.payload.putUnsignedInt(last_action); - + packet.payload.putUnsignedInt(last_recovery); - + packet.payload.putUnsignedInt(last_clear); - + packet.payload.putUnsignedShort(breach_count); - + packet.payload.putUnsignedByte(limits_state); - + packet.payload.putUnsignedByte(mods_enabled); - + packet.payload.putUnsignedByte(mods_required); - + packet.payload.putUnsignedByte(mods_triggered); - + return packet; } /** - * Decode a limits_status message into this class fields - * - * @param payload The message to decode - */ + * Decode a limits_status message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.last_trigger = payload.getUnsignedInt(); - + this.last_action = payload.getUnsignedInt(); - + this.last_recovery = payload.getUnsignedInt(); - + this.last_clear = payload.getUnsignedInt(); - + this.breach_count = payload.getUnsignedShort(); - + this.limits_state = payload.getUnsignedByte(); - + this.mods_enabled = payload.getUnsignedByte(); - + this.mods_required = payload.getUnsignedByte(); - + this.mods_triggered = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_limits_status(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_limits_status() { msgid = MAVLINK_MSG_ID_LIMITS_STATUS; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_limits_status(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_limits_status(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_LIMITS_STATUS; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_LIMITS_STATUS - sysid:"+sysid+" compid:"+compid+" last_trigger:"+last_trigger+" last_action:"+last_action+" last_recovery:"+last_recovery+" last_clear:"+last_clear+" breach_count:"+breach_count+" limits_state:"+limits_state+" mods_enabled:"+mods_enabled+" mods_required:"+mods_required+" mods_triggered:"+mods_triggered+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_LIMITS_STATUS - sysid:" + sysid + " compid:" + compid + " last_trigger:" + last_trigger + " last_action:" + last_action + " last_recovery:" + last_recovery + " last_clear:" + last_clear + " breach_count:" + breach_count + " limits_state:" + limits_state + " mods_enabled:" + mods_enabled + " mods_required:" + mods_required + " mods_triggered:" + mods_triggered + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_mag_cal_progress.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_mag_cal_progress.java index 34444ab..5248b83 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_mag_cal_progress.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_mag_cal_progress.java @@ -6,159 +6,159 @@ // MESSAGE MAG_CAL_PROGRESS PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Reports progress of compass calibration. -*/ -public class msg_mag_cal_progress extends MAVLinkMessage{ + * Reports progress of compass calibration. + */ +public class msg_mag_cal_progress extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MAG_CAL_PROGRESS = 191; public static final int MAVLINK_MSG_LENGTH = 27; private static final long serialVersionUID = MAVLINK_MSG_ID_MAG_CAL_PROGRESS; - /** - * Body frame direction vector for display. - */ + * Body frame direction vector for display. + */ public float direction_x; - - /** - * Body frame direction vector for display. - */ - public float direction_y; - - /** - * Body frame direction vector for display. - */ - public float direction_z; - - /** - * Compass being calibrated. - */ - public short compass_id; - - /** - * Bitmask of compasses being calibrated. - */ - public short cal_mask; - - /** - * Calibration Status. - */ - public short cal_status; - - /** - * Attempt number. - */ - public short attempt; - - /** - * Completion percentage. - */ - public short completion_pct; - - /** - * Bitmask of sphere sections (see http://en.wikipedia.org/wiki/Geodesic_grid). - */ - public short completion_mask[] = new short[10]; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Body frame direction vector for display. + */ + public float direction_y; + + /** + * Body frame direction vector for display. + */ + public float direction_z; + + /** + * Compass being calibrated. + */ + public short compass_id; + + /** + * Bitmask of compasses being calibrated. + */ + public short cal_mask; + + /** + * Calibration Status. + */ + public short cal_status; + + /** + * Attempt number. + */ + public short attempt; + + /** + * Completion percentage. + */ + public short completion_pct; + + /** + * Bitmask of sphere sections (see http://en.wikipedia.org/wiki/Geodesic_grid). + */ + public short completion_mask[] = new short[10]; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MAG_CAL_PROGRESS; - + packet.payload.putFloat(direction_x); - + packet.payload.putFloat(direction_y); - + packet.payload.putFloat(direction_z); - + packet.payload.putUnsignedByte(compass_id); - + packet.payload.putUnsignedByte(cal_mask); - + packet.payload.putUnsignedByte(cal_status); - + packet.payload.putUnsignedByte(attempt); - + packet.payload.putUnsignedByte(completion_pct); - - + + for (int i = 0; i < completion_mask.length; i++) { packet.payload.putUnsignedByte(completion_mask[i]); } - - + + return packet; } /** - * Decode a mag_cal_progress message into this class fields - * - * @param payload The message to decode - */ + * Decode a mag_cal_progress message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.direction_x = payload.getFloat(); - + this.direction_y = payload.getFloat(); - + this.direction_z = payload.getFloat(); - + this.compass_id = payload.getUnsignedByte(); - + this.cal_mask = payload.getUnsignedByte(); - + this.cal_status = payload.getUnsignedByte(); - + this.attempt = payload.getUnsignedByte(); - + this.completion_pct = payload.getUnsignedByte(); - - + + for (int i = 0; i < this.completion_mask.length; i++) { this.completion_mask[i] = payload.getUnsignedByte(); } - - + + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_mag_cal_progress(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_mag_cal_progress() { msgid = MAVLINK_MSG_ID_MAG_CAL_PROGRESS; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_mag_cal_progress(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_mag_cal_progress(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MAG_CAL_PROGRESS; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MAG_CAL_PROGRESS - sysid:"+sysid+" compid:"+compid+" direction_x:"+direction_x+" direction_y:"+direction_y+" direction_z:"+direction_z+" compass_id:"+compass_id+" cal_mask:"+cal_mask+" cal_status:"+cal_status+" attempt:"+attempt+" completion_pct:"+completion_pct+" completion_mask:"+completion_mask+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MAG_CAL_PROGRESS - sysid:" + sysid + " compid:" + compid + " direction_x:" + direction_x + " direction_y:" + direction_y + " direction_z:" + direction_z + " compass_id:" + compass_id + " cal_mask:" + cal_mask + " cal_status:" + cal_status + " attempt:" + attempt + " completion_pct:" + completion_pct + " completion_mask:" + completion_mask + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_mag_cal_report.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_mag_cal_report.java index e840047..92cae1e 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_mag_cal_report.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_mag_cal_report.java @@ -6,232 +6,232 @@ // MESSAGE MAG_CAL_REPORT PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Reports results of completed compass calibration. Sent until MAG_CAL_ACK received. -*/ -public class msg_mag_cal_report extends MAVLinkMessage{ + * Reports results of completed compass calibration. Sent until MAG_CAL_ACK received. + */ +public class msg_mag_cal_report extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MAG_CAL_REPORT = 192; public static final int MAVLINK_MSG_LENGTH = 54; private static final long serialVersionUID = MAVLINK_MSG_ID_MAG_CAL_REPORT; - /** - * RMS milligauss residuals. - */ + * RMS milligauss residuals. + */ public float fitness; - - /** - * X offset. - */ - public float ofs_x; - - /** - * Y offset. - */ - public float ofs_y; - - /** - * Z offset. - */ - public float ofs_z; - - /** - * X diagonal (matrix 11). - */ - public float diag_x; - - /** - * Y diagonal (matrix 22). - */ - public float diag_y; - - /** - * Z diagonal (matrix 33). - */ - public float diag_z; - - /** - * X off-diagonal (matrix 12 and 21). - */ - public float offdiag_x; - - /** - * Y off-diagonal (matrix 13 and 31). - */ - public float offdiag_y; - - /** - * Z off-diagonal (matrix 32 and 23). - */ - public float offdiag_z; - - /** - * Compass being calibrated. - */ - public short compass_id; - - /** - * Bitmask of compasses being calibrated. - */ - public short cal_mask; - - /** - * Calibration Status. - */ - public short cal_status; - - /** - * 0=requires a MAV_CMD_DO_ACCEPT_MAG_CAL, 1=saved to parameters. - */ - public short autosaved; - - /** - * Confidence in orientation (higher is better). - */ - public float orientation_confidence; - - /** - * orientation before calibration. - */ - public short old_orientation; - - /** - * orientation after calibration. - */ - public short new_orientation; - - /** - * field radius correction factor - */ - public float scale_factor; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * X offset. + */ + public float ofs_x; + + /** + * Y offset. + */ + public float ofs_y; + + /** + * Z offset. + */ + public float ofs_z; + + /** + * X diagonal (matrix 11). + */ + public float diag_x; + + /** + * Y diagonal (matrix 22). + */ + public float diag_y; + + /** + * Z diagonal (matrix 33). + */ + public float diag_z; + + /** + * X off-diagonal (matrix 12 and 21). + */ + public float offdiag_x; + + /** + * Y off-diagonal (matrix 13 and 31). + */ + public float offdiag_y; + + /** + * Z off-diagonal (matrix 32 and 23). + */ + public float offdiag_z; + + /** + * Compass being calibrated. + */ + public short compass_id; + + /** + * Bitmask of compasses being calibrated. + */ + public short cal_mask; + + /** + * Calibration Status. + */ + public short cal_status; + + /** + * 0=requires a MAV_CMD_DO_ACCEPT_MAG_CAL, 1=saved to parameters. + */ + public short autosaved; + + /** + * Confidence in orientation (higher is better). + */ + public float orientation_confidence; + + /** + * orientation before calibration. + */ + public short old_orientation; + + /** + * orientation after calibration. + */ + public short new_orientation; + + /** + * field radius correction factor + */ + public float scale_factor; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MAG_CAL_REPORT; - + packet.payload.putFloat(fitness); - + packet.payload.putFloat(ofs_x); - + packet.payload.putFloat(ofs_y); - + packet.payload.putFloat(ofs_z); - + packet.payload.putFloat(diag_x); - + packet.payload.putFloat(diag_y); - + packet.payload.putFloat(diag_z); - + packet.payload.putFloat(offdiag_x); - + packet.payload.putFloat(offdiag_y); - + packet.payload.putFloat(offdiag_z); - + packet.payload.putUnsignedByte(compass_id); - + packet.payload.putUnsignedByte(cal_mask); - + packet.payload.putUnsignedByte(cal_status); - + packet.payload.putUnsignedByte(autosaved); - + packet.payload.putFloat(orientation_confidence); - + packet.payload.putUnsignedByte(old_orientation); - + packet.payload.putUnsignedByte(new_orientation); - + packet.payload.putFloat(scale_factor); - + return packet; } /** - * Decode a mag_cal_report message into this class fields - * - * @param payload The message to decode - */ + * Decode a mag_cal_report message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.fitness = payload.getFloat(); - + this.ofs_x = payload.getFloat(); - + this.ofs_y = payload.getFloat(); - + this.ofs_z = payload.getFloat(); - + this.diag_x = payload.getFloat(); - + this.diag_y = payload.getFloat(); - + this.diag_z = payload.getFloat(); - + this.offdiag_x = payload.getFloat(); - + this.offdiag_y = payload.getFloat(); - + this.offdiag_z = payload.getFloat(); - + this.compass_id = payload.getUnsignedByte(); - + this.cal_mask = payload.getUnsignedByte(); - + this.cal_status = payload.getUnsignedByte(); - + this.autosaved = payload.getUnsignedByte(); - + this.orientation_confidence = payload.getFloat(); - + this.old_orientation = payload.getUnsignedByte(); - + this.new_orientation = payload.getUnsignedByte(); - + this.scale_factor = payload.getFloat(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_mag_cal_report(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_mag_cal_report() { msgid = MAVLINK_MSG_ID_MAG_CAL_REPORT; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_mag_cal_report(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_mag_cal_report(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MAG_CAL_REPORT; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MAG_CAL_REPORT - sysid:"+sysid+" compid:"+compid+" fitness:"+fitness+" ofs_x:"+ofs_x+" ofs_y:"+ofs_y+" ofs_z:"+ofs_z+" diag_x:"+diag_x+" diag_y:"+diag_y+" diag_z:"+diag_z+" offdiag_x:"+offdiag_x+" offdiag_y:"+offdiag_y+" offdiag_z:"+offdiag_z+" compass_id:"+compass_id+" cal_mask:"+cal_mask+" cal_status:"+cal_status+" autosaved:"+autosaved+" orientation_confidence:"+orientation_confidence+" old_orientation:"+old_orientation+" new_orientation:"+new_orientation+" scale_factor:"+scale_factor+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MAG_CAL_REPORT - sysid:" + sysid + " compid:" + compid + " fitness:" + fitness + " ofs_x:" + ofs_x + " ofs_y:" + ofs_y + " ofs_z:" + ofs_z + " diag_x:" + diag_x + " diag_y:" + diag_y + " diag_z:" + diag_z + " offdiag_x:" + offdiag_x + " offdiag_y:" + offdiag_y + " offdiag_z:" + offdiag_z + " compass_id:" + compass_id + " cal_mask:" + cal_mask + " cal_status:" + cal_status + " autosaved:" + autosaved + " orientation_confidence:" + orientation_confidence + " old_orientation:" + old_orientation + " new_orientation:" + new_orientation + " scale_factor:" + scale_factor + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_meminfo.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_meminfo.java index ff641d4..7b81adf 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_meminfo.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_meminfo.java @@ -6,97 +6,97 @@ // MESSAGE MEMINFO PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* State of APM memory. -*/ -public class msg_meminfo extends MAVLinkMessage{ + * State of APM memory. + */ +public class msg_meminfo extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MEMINFO = 152; public static final int MAVLINK_MSG_LENGTH = 8; private static final long serialVersionUID = MAVLINK_MSG_ID_MEMINFO; - /** - * Heap top. - */ + * Heap top. + */ public int brkval; - - /** - * Free memory. - */ - public int freemem; - - /** - * Free memory (32 bit). - */ - public long freemem32; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Free memory. + */ + public int freemem; + + /** + * Free memory (32 bit). + */ + public long freemem32; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MEMINFO; - + packet.payload.putUnsignedShort(brkval); - + packet.payload.putUnsignedShort(freemem); - + packet.payload.putUnsignedInt(freemem32); - + return packet; } /** - * Decode a meminfo message into this class fields - * - * @param payload The message to decode - */ + * Decode a meminfo message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.brkval = payload.getUnsignedShort(); - + this.freemem = payload.getUnsignedShort(); - + this.freemem32 = payload.getUnsignedInt(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_meminfo(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_meminfo() { msgid = MAVLINK_MSG_ID_MEMINFO; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_meminfo(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_meminfo(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MEMINFO; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MEMINFO - sysid:"+sysid+" compid:"+compid+" brkval:"+brkval+" freemem:"+freemem+" freemem32:"+freemem32+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MEMINFO - sysid:" + sysid + " compid:" + compid + " brkval:" + brkval + " freemem:" + freemem + " freemem32:" + freemem32 + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_mount_configure.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_mount_configure.java index a25a9ab..b71a073 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_mount_configure.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_mount_configure.java @@ -6,124 +6,124 @@ // MESSAGE MOUNT_CONFIGURE PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Message to configure a camera mount, directional antenna, etc. -*/ -public class msg_mount_configure extends MAVLinkMessage{ + * Message to configure a camera mount, directional antenna, etc. + */ +public class msg_mount_configure extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MOUNT_CONFIGURE = 156; public static final int MAVLINK_MSG_LENGTH = 6; private static final long serialVersionUID = MAVLINK_MSG_ID_MOUNT_CONFIGURE; - /** - * System ID. - */ + * System ID. + */ public short target_system; - - /** - * Component ID. - */ - public short target_component; - - /** - * Mount operating mode. - */ - public short mount_mode; - - /** - * (1 = yes, 0 = no). - */ - public short stab_roll; - - /** - * (1 = yes, 0 = no). - */ - public short stab_pitch; - - /** - * (1 = yes, 0 = no). - */ - public short stab_yaw; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Component ID. + */ + public short target_component; + + /** + * Mount operating mode. + */ + public short mount_mode; + + /** + * (1 = yes, 0 = no). + */ + public short stab_roll; + + /** + * (1 = yes, 0 = no). + */ + public short stab_pitch; + + /** + * (1 = yes, 0 = no). + */ + public short stab_yaw; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MOUNT_CONFIGURE; - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + packet.payload.putUnsignedByte(mount_mode); - + packet.payload.putUnsignedByte(stab_roll); - + packet.payload.putUnsignedByte(stab_pitch); - + packet.payload.putUnsignedByte(stab_yaw); - + return packet; } /** - * Decode a mount_configure message into this class fields - * - * @param payload The message to decode - */ + * Decode a mount_configure message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + this.mount_mode = payload.getUnsignedByte(); - + this.stab_roll = payload.getUnsignedByte(); - + this.stab_pitch = payload.getUnsignedByte(); - + this.stab_yaw = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_mount_configure(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_mount_configure() { msgid = MAVLINK_MSG_ID_MOUNT_CONFIGURE; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_mount_configure(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_mount_configure(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MOUNT_CONFIGURE; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MOUNT_CONFIGURE - sysid:"+sysid+" compid:"+compid+" target_system:"+target_system+" target_component:"+target_component+" mount_mode:"+mount_mode+" stab_roll:"+stab_roll+" stab_pitch:"+stab_pitch+" stab_yaw:"+stab_yaw+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MOUNT_CONFIGURE - sysid:" + sysid + " compid:" + compid + " target_system:" + target_system + " target_component:" + target_component + " mount_mode:" + mount_mode + " stab_roll:" + stab_roll + " stab_pitch:" + stab_pitch + " stab_yaw:" + stab_yaw + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_mount_control.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_mount_control.java index fb41f38..681adda 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_mount_control.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_mount_control.java @@ -6,124 +6,124 @@ // MESSAGE MOUNT_CONTROL PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Message to control a camera mount, directional antenna, etc. -*/ -public class msg_mount_control extends MAVLinkMessage{ + * Message to control a camera mount, directional antenna, etc. + */ +public class msg_mount_control extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MOUNT_CONTROL = 157; public static final int MAVLINK_MSG_LENGTH = 15; private static final long serialVersionUID = MAVLINK_MSG_ID_MOUNT_CONTROL; - /** - * Pitch (centi-degrees) or lat (degE7), depending on mount mode. - */ + * Pitch (centi-degrees) or lat (degE7), depending on mount mode. + */ public int input_a; - - /** - * Roll (centi-degrees) or lon (degE7) depending on mount mode. - */ - public int input_b; - - /** - * Yaw (centi-degrees) or alt (cm) depending on mount mode. - */ - public int input_c; - - /** - * System ID. - */ - public short target_system; - - /** - * Component ID. - */ - public short target_component; - - /** - * If "1" it will save current trimmed position on EEPROM (just valid for NEUTRAL and LANDING). - */ - public short save_position; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Roll (centi-degrees) or lon (degE7) depending on mount mode. + */ + public int input_b; + + /** + * Yaw (centi-degrees) or alt (cm) depending on mount mode. + */ + public int input_c; + + /** + * System ID. + */ + public short target_system; + + /** + * Component ID. + */ + public short target_component; + + /** + * If "1" it will save current trimmed position on EEPROM (just valid for NEUTRAL and LANDING). + */ + public short save_position; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MOUNT_CONTROL; - + packet.payload.putInt(input_a); - + packet.payload.putInt(input_b); - + packet.payload.putInt(input_c); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + packet.payload.putUnsignedByte(save_position); - + return packet; } /** - * Decode a mount_control message into this class fields - * - * @param payload The message to decode - */ + * Decode a mount_control message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.input_a = payload.getInt(); - + this.input_b = payload.getInt(); - + this.input_c = payload.getInt(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + this.save_position = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_mount_control(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_mount_control() { msgid = MAVLINK_MSG_ID_MOUNT_CONTROL; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_mount_control(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_mount_control(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MOUNT_CONTROL; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MOUNT_CONTROL - sysid:"+sysid+" compid:"+compid+" input_a:"+input_a+" input_b:"+input_b+" input_c:"+input_c+" target_system:"+target_system+" target_component:"+target_component+" save_position:"+save_position+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MOUNT_CONTROL - sysid:" + sysid + " compid:" + compid + " input_a:" + input_a + " input_b:" + input_b + " input_c:" + input_c + " target_system:" + target_system + " target_component:" + target_component + " save_position:" + save_position + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_mount_status.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_mount_status.java index fbfc9af..fa9d244 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_mount_status.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_mount_status.java @@ -6,115 +6,115 @@ // MESSAGE MOUNT_STATUS PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Message with some status from APM to GCS about camera or antenna mount. -*/ -public class msg_mount_status extends MAVLinkMessage{ + * Message with some status from APM to GCS about camera or antenna mount. + */ +public class msg_mount_status extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MOUNT_STATUS = 158; public static final int MAVLINK_MSG_LENGTH = 14; private static final long serialVersionUID = MAVLINK_MSG_ID_MOUNT_STATUS; - /** - * Pitch. - */ + * Pitch. + */ public int pointing_a; - - /** - * Roll. - */ - public int pointing_b; - - /** - * Yaw. - */ - public int pointing_c; - - /** - * System ID. - */ - public short target_system; - - /** - * Component ID. - */ - public short target_component; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Roll. + */ + public int pointing_b; + + /** + * Yaw. + */ + public int pointing_c; + + /** + * System ID. + */ + public short target_system; + + /** + * Component ID. + */ + public short target_component; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MOUNT_STATUS; - + packet.payload.putInt(pointing_a); - + packet.payload.putInt(pointing_b); - + packet.payload.putInt(pointing_c); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + return packet; } /** - * Decode a mount_status message into this class fields - * - * @param payload The message to decode - */ + * Decode a mount_status message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.pointing_a = payload.getInt(); - + this.pointing_b = payload.getInt(); - + this.pointing_c = payload.getInt(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_mount_status(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_mount_status() { msgid = MAVLINK_MSG_ID_MOUNT_STATUS; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_mount_status(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_mount_status(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MOUNT_STATUS; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MOUNT_STATUS - sysid:"+sysid+" compid:"+compid+" pointing_a:"+pointing_a+" pointing_b:"+pointing_b+" pointing_c:"+pointing_c+" target_system:"+target_system+" target_component:"+target_component+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MOUNT_STATUS - sysid:" + sysid + " compid:" + compid + " pointing_a:" + pointing_a + " pointing_b:" + pointing_b + " pointing_c:" + pointing_c + " target_system:" + target_system + " target_component:" + target_component + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_pid_tuning.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_pid_tuning.java index c6d4f52..cbcf55e 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_pid_tuning.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_pid_tuning.java @@ -6,133 +6,133 @@ // MESSAGE PID_TUNING PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* PID tuning information. -*/ -public class msg_pid_tuning extends MAVLinkMessage{ + * PID tuning information. + */ +public class msg_pid_tuning extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_PID_TUNING = 194; public static final int MAVLINK_MSG_LENGTH = 25; private static final long serialVersionUID = MAVLINK_MSG_ID_PID_TUNING; - /** - * Desired rate. - */ + * Desired rate. + */ public float desired; - - /** - * Achieved rate. - */ - public float achieved; - - /** - * FF component. - */ - public float FF; - - /** - * P component. - */ - public float P; - - /** - * I component. - */ - public float I; - - /** - * D component. - */ - public float D; - - /** - * Axis. - */ - public short axis; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Achieved rate. + */ + public float achieved; + + /** + * FF component. + */ + public float FF; + + /** + * P component. + */ + public float P; + + /** + * I component. + */ + public float I; + + /** + * D component. + */ + public float D; + + /** + * Axis. + */ + public short axis; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_PID_TUNING; - + packet.payload.putFloat(desired); - + packet.payload.putFloat(achieved); - + packet.payload.putFloat(FF); - + packet.payload.putFloat(P); - + packet.payload.putFloat(I); - + packet.payload.putFloat(D); - + packet.payload.putUnsignedByte(axis); - + return packet; } /** - * Decode a pid_tuning message into this class fields - * - * @param payload The message to decode - */ + * Decode a pid_tuning message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.desired = payload.getFloat(); - + this.achieved = payload.getFloat(); - + this.FF = payload.getFloat(); - + this.P = payload.getFloat(); - + this.I = payload.getFloat(); - + this.D = payload.getFloat(); - + this.axis = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_pid_tuning(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_pid_tuning() { msgid = MAVLINK_MSG_ID_PID_TUNING; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_pid_tuning(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_pid_tuning(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_PID_TUNING; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_PID_TUNING - sysid:"+sysid+" compid:"+compid+" desired:"+desired+" achieved:"+achieved+" FF:"+FF+" P:"+P+" I:"+I+" D:"+D+" axis:"+axis+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_PID_TUNING - sysid:" + sysid + " compid:" + compid + " desired:" + desired + " achieved:" + achieved + " FF:" + FF + " P:" + P + " I:" + I + " D:" + D + " axis:" + axis + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_radio.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_radio.java index d9cba65..5816b1e 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_radio.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_radio.java @@ -6,133 +6,133 @@ // MESSAGE RADIO PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Status generated by radio. -*/ -public class msg_radio extends MAVLinkMessage{ + * Status generated by radio. + */ +public class msg_radio extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_RADIO = 166; public static final int MAVLINK_MSG_LENGTH = 9; private static final long serialVersionUID = MAVLINK_MSG_ID_RADIO; - /** - * Receive errors. - */ + * Receive errors. + */ public int rxerrors; - - /** - * Count of error corrected packets. - */ - public int fixed; - - /** - * Local signal strength. - */ - public short rssi; - - /** - * Remote signal strength. - */ - public short remrssi; - - /** - * How full the tx buffer is. - */ - public short txbuf; - - /** - * Background noise level. - */ - public short noise; - - /** - * Remote background noise level. - */ - public short remnoise; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Count of error corrected packets. + */ + public int fixed; + + /** + * Local signal strength. + */ + public short rssi; + + /** + * Remote signal strength. + */ + public short remrssi; + + /** + * How full the tx buffer is. + */ + public short txbuf; + + /** + * Background noise level. + */ + public short noise; + + /** + * Remote background noise level. + */ + public short remnoise; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_RADIO; - + packet.payload.putUnsignedShort(rxerrors); - + packet.payload.putUnsignedShort(fixed); - + packet.payload.putUnsignedByte(rssi); - + packet.payload.putUnsignedByte(remrssi); - + packet.payload.putUnsignedByte(txbuf); - + packet.payload.putUnsignedByte(noise); - + packet.payload.putUnsignedByte(remnoise); - + return packet; } /** - * Decode a radio message into this class fields - * - * @param payload The message to decode - */ + * Decode a radio message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.rxerrors = payload.getUnsignedShort(); - + this.fixed = payload.getUnsignedShort(); - + this.rssi = payload.getUnsignedByte(); - + this.remrssi = payload.getUnsignedByte(); - + this.txbuf = payload.getUnsignedByte(); - + this.noise = payload.getUnsignedByte(); - + this.remnoise = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_radio(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_radio() { msgid = MAVLINK_MSG_ID_RADIO; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_radio(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_radio(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_RADIO; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_RADIO - sysid:"+sysid+" compid:"+compid+" rxerrors:"+rxerrors+" fixed:"+fixed+" rssi:"+rssi+" remrssi:"+remrssi+" txbuf:"+txbuf+" noise:"+noise+" remnoise:"+remnoise+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_RADIO - sysid:" + sysid + " compid:" + compid + " rxerrors:" + rxerrors + " fixed:" + fixed + " rssi:" + rssi + " remrssi:" + remrssi + " txbuf:" + txbuf + " noise:" + noise + " remnoise:" + remnoise + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_rally_fetch_point.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_rally_fetch_point.java index 5a00562..e1e7ccb 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_rally_fetch_point.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_rally_fetch_point.java @@ -6,97 +6,97 @@ // MESSAGE RALLY_FETCH_POINT PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Request a current rally point from MAV. MAV should respond with a RALLY_POINT message. MAV should not respond if the request is invalid. -*/ -public class msg_rally_fetch_point extends MAVLinkMessage{ + * Request a current rally point from MAV. MAV should respond with a RALLY_POINT message. MAV should not respond if the request is invalid. + */ +public class msg_rally_fetch_point extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_RALLY_FETCH_POINT = 176; public static final int MAVLINK_MSG_LENGTH = 3; private static final long serialVersionUID = MAVLINK_MSG_ID_RALLY_FETCH_POINT; - /** - * System ID. - */ + * System ID. + */ public short target_system; - - /** - * Component ID. - */ - public short target_component; - - /** - * Point index (first point is 0). - */ - public short idx; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Component ID. + */ + public short target_component; + + /** + * Point index (first point is 0). + */ + public short idx; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_RALLY_FETCH_POINT; - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + packet.payload.putUnsignedByte(idx); - + return packet; } /** - * Decode a rally_fetch_point message into this class fields - * - * @param payload The message to decode - */ + * Decode a rally_fetch_point message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + this.idx = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_rally_fetch_point(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_rally_fetch_point() { msgid = MAVLINK_MSG_ID_RALLY_FETCH_POINT; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_rally_fetch_point(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_rally_fetch_point(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_RALLY_FETCH_POINT; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_RALLY_FETCH_POINT - sysid:"+sysid+" compid:"+compid+" target_system:"+target_system+" target_component:"+target_component+" idx:"+idx+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_RALLY_FETCH_POINT - sysid:" + sysid + " compid:" + compid + " target_system:" + target_system + " target_component:" + target_component + " idx:" + idx + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_rally_point.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_rally_point.java index 3611b6c..8529a68 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_rally_point.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_rally_point.java @@ -6,160 +6,160 @@ // MESSAGE RALLY_POINT PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* A rally point. Used to set a point when from GCS -> MAV. Also used to return a point from MAV -> GCS. -*/ -public class msg_rally_point extends MAVLinkMessage{ + * A rally point. Used to set a point when from GCS -> MAV. Also used to return a point from MAV -> GCS. + */ +public class msg_rally_point extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_RALLY_POINT = 175; public static final int MAVLINK_MSG_LENGTH = 19; private static final long serialVersionUID = MAVLINK_MSG_ID_RALLY_POINT; - /** - * Latitude of point. - */ + * Latitude of point. + */ public int lat; - - /** - * Longitude of point. - */ - public int lng; - - /** - * Transit / loiter altitude relative to home. - */ - public short alt; - - /** - * Break altitude relative to home. - */ - public short break_alt; - - /** - * Heading to aim for when landing. - */ - public int land_dir; - - /** - * System ID. - */ - public short target_system; - - /** - * Component ID. - */ - public short target_component; - - /** - * Point index (first point is 0). - */ - public short idx; - - /** - * Total number of points (for sanity checking). - */ - public short count; - - /** - * Configuration flags. - */ - public short flags; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Longitude of point. + */ + public int lng; + + /** + * Transit / loiter altitude relative to home. + */ + public short alt; + + /** + * Break altitude relative to home. + */ + public short break_alt; + + /** + * Heading to aim for when landing. + */ + public int land_dir; + + /** + * System ID. + */ + public short target_system; + + /** + * Component ID. + */ + public short target_component; + + /** + * Point index (first point is 0). + */ + public short idx; + + /** + * Total number of points (for sanity checking). + */ + public short count; + + /** + * Configuration flags. + */ + public short flags; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_RALLY_POINT; - + packet.payload.putInt(lat); - + packet.payload.putInt(lng); - + packet.payload.putShort(alt); - + packet.payload.putShort(break_alt); - + packet.payload.putUnsignedShort(land_dir); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + packet.payload.putUnsignedByte(idx); - + packet.payload.putUnsignedByte(count); - + packet.payload.putUnsignedByte(flags); - + return packet; } /** - * Decode a rally_point message into this class fields - * - * @param payload The message to decode - */ + * Decode a rally_point message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.lat = payload.getInt(); - + this.lng = payload.getInt(); - + this.alt = payload.getShort(); - + this.break_alt = payload.getShort(); - + this.land_dir = payload.getUnsignedShort(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + this.idx = payload.getUnsignedByte(); - + this.count = payload.getUnsignedByte(); - + this.flags = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_rally_point(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_rally_point() { msgid = MAVLINK_MSG_ID_RALLY_POINT; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_rally_point(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_rally_point(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_RALLY_POINT; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_RALLY_POINT - sysid:"+sysid+" compid:"+compid+" lat:"+lat+" lng:"+lng+" alt:"+alt+" break_alt:"+break_alt+" land_dir:"+land_dir+" target_system:"+target_system+" target_component:"+target_component+" idx:"+idx+" count:"+count+" flags:"+flags+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_RALLY_POINT - sysid:" + sysid + " compid:" + compid + " lat:" + lat + " lng:" + lng + " alt:" + alt + " break_alt:" + break_alt + " land_dir:" + land_dir + " target_system:" + target_system + " target_component:" + target_component + " idx:" + idx + " count:" + count + " flags:" + flags + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_rangefinder.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_rangefinder.java index d6d061c..e331146 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_rangefinder.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_rangefinder.java @@ -6,88 +6,88 @@ // MESSAGE RANGEFINDER PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Rangefinder reporting. -*/ -public class msg_rangefinder extends MAVLinkMessage{ + * Rangefinder reporting. + */ +public class msg_rangefinder extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_RANGEFINDER = 173; public static final int MAVLINK_MSG_LENGTH = 8; private static final long serialVersionUID = MAVLINK_MSG_ID_RANGEFINDER; - /** - * Distance. - */ + * Distance. + */ public float distance; - - /** - * Raw voltage if available, zero otherwise. - */ - public float voltage; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Raw voltage if available, zero otherwise. + */ + public float voltage; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_RANGEFINDER; - + packet.payload.putFloat(distance); - + packet.payload.putFloat(voltage); - + return packet; } /** - * Decode a rangefinder message into this class fields - * - * @param payload The message to decode - */ + * Decode a rangefinder message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.distance = payload.getFloat(); - + this.voltage = payload.getFloat(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_rangefinder(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_rangefinder() { msgid = MAVLINK_MSG_ID_RANGEFINDER; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_rangefinder(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_rangefinder(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_RANGEFINDER; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_RANGEFINDER - sysid:"+sysid+" compid:"+compid+" distance:"+distance+" voltage:"+voltage+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_RANGEFINDER - sysid:" + sysid + " compid:" + compid + " distance:" + distance + " voltage:" + voltage + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_remote_log_block_status.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_remote_log_block_status.java index 169f2d1..68b10c8 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_remote_log_block_status.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_remote_log_block_status.java @@ -6,106 +6,106 @@ // MESSAGE REMOTE_LOG_BLOCK_STATUS PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Send Status of each log block that autopilot board might have sent. -*/ -public class msg_remote_log_block_status extends MAVLinkMessage{ + * Send Status of each log block that autopilot board might have sent. + */ +public class msg_remote_log_block_status extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_REMOTE_LOG_BLOCK_STATUS = 185; public static final int MAVLINK_MSG_LENGTH = 7; private static final long serialVersionUID = MAVLINK_MSG_ID_REMOTE_LOG_BLOCK_STATUS; - /** - * Log data block sequence number. - */ + * Log data block sequence number. + */ public long seqno; - - /** - * System ID. - */ - public short target_system; - - /** - * Component ID. - */ - public short target_component; - - /** - * Log data block status. - */ - public short status; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * System ID. + */ + public short target_system; + + /** + * Component ID. + */ + public short target_component; + + /** + * Log data block status. + */ + public short status; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_REMOTE_LOG_BLOCK_STATUS; - + packet.payload.putUnsignedInt(seqno); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + packet.payload.putUnsignedByte(status); - + return packet; } /** - * Decode a remote_log_block_status message into this class fields - * - * @param payload The message to decode - */ + * Decode a remote_log_block_status message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.seqno = payload.getUnsignedInt(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + this.status = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_remote_log_block_status(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_remote_log_block_status() { msgid = MAVLINK_MSG_ID_REMOTE_LOG_BLOCK_STATUS; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_remote_log_block_status(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_remote_log_block_status(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_REMOTE_LOG_BLOCK_STATUS; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_REMOTE_LOG_BLOCK_STATUS - sysid:"+sysid+" compid:"+compid+" seqno:"+seqno+" target_system:"+target_system+" target_component:"+target_component+" status:"+status+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_REMOTE_LOG_BLOCK_STATUS - sysid:" + sysid + " compid:" + compid + " seqno:" + seqno + " target_system:" + target_system + " target_component:" + target_component + " status:" + status + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_remote_log_data_block.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_remote_log_data_block.java index 1b38347..e89adcd 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_remote_log_data_block.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_remote_log_data_block.java @@ -6,114 +6,114 @@ // MESSAGE REMOTE_LOG_DATA_BLOCK PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Send a block of log data to remote location. -*/ -public class msg_remote_log_data_block extends MAVLinkMessage{ + * Send a block of log data to remote location. + */ +public class msg_remote_log_data_block extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_REMOTE_LOG_DATA_BLOCK = 184; public static final int MAVLINK_MSG_LENGTH = 206; private static final long serialVersionUID = MAVLINK_MSG_ID_REMOTE_LOG_DATA_BLOCK; - /** - * Log data block sequence number. - */ + * Log data block sequence number. + */ public long seqno; - - /** - * System ID. - */ - public short target_system; - - /** - * Component ID. - */ - public short target_component; - - /** - * Log data block. - */ - public short data[] = new short[200]; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * System ID. + */ + public short target_system; + + /** + * Component ID. + */ + public short target_component; + + /** + * Log data block. + */ + public short data[] = new short[200]; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_REMOTE_LOG_DATA_BLOCK; - + packet.payload.putUnsignedInt(seqno); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - - + + for (int i = 0; i < data.length; i++) { packet.payload.putUnsignedByte(data[i]); } - - + + return packet; } /** - * Decode a remote_log_data_block message into this class fields - * - * @param payload The message to decode - */ + * Decode a remote_log_data_block message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.seqno = payload.getUnsignedInt(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - - + + for (int i = 0; i < this.data.length; i++) { this.data[i] = payload.getUnsignedByte(); } - - + + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_remote_log_data_block(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_remote_log_data_block() { msgid = MAVLINK_MSG_ID_REMOTE_LOG_DATA_BLOCK; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_remote_log_data_block(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_remote_log_data_block(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_REMOTE_LOG_DATA_BLOCK; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_REMOTE_LOG_DATA_BLOCK - sysid:"+sysid+" compid:"+compid+" seqno:"+seqno+" target_system:"+target_system+" target_component:"+target_component+" data:"+data+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_REMOTE_LOG_DATA_BLOCK - sysid:" + sysid + " compid:" + compid + " seqno:" + seqno + " target_system:" + target_system + " target_component:" + target_component + " data:" + data + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_rpm.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_rpm.java index c6e5259..2272fe7 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_rpm.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_rpm.java @@ -6,88 +6,88 @@ // MESSAGE RPM PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* RPM sensor output. -*/ -public class msg_rpm extends MAVLinkMessage{ + * RPM sensor output. + */ +public class msg_rpm extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_RPM = 226; public static final int MAVLINK_MSG_LENGTH = 8; private static final long serialVersionUID = MAVLINK_MSG_ID_RPM; - /** - * RPM Sensor1. - */ + * RPM Sensor1. + */ public float rpm1; - - /** - * RPM Sensor2. - */ - public float rpm2; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * RPM Sensor2. + */ + public float rpm2; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_RPM; - + packet.payload.putFloat(rpm1); - + packet.payload.putFloat(rpm2); - + return packet; } /** - * Decode a rpm message into this class fields - * - * @param payload The message to decode - */ + * Decode a rpm message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.rpm1 = payload.getFloat(); - + this.rpm2 = payload.getFloat(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_rpm(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_rpm() { msgid = MAVLINK_MSG_ID_RPM; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_rpm(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_rpm(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_RPM; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_RPM - sysid:"+sysid+" compid:"+compid+" rpm1:"+rpm1+" rpm2:"+rpm2+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_RPM - sysid:" + sysid + " compid:" + compid + " rpm1:" + rpm1 + " rpm2:" + rpm2 + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_sensor_offsets.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_sensor_offsets.java index 065e64a..e6f61e0 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_sensor_offsets.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_sensor_offsets.java @@ -6,178 +6,178 @@ // MESSAGE SENSOR_OFFSETS PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Offsets and calibrations values for hardware sensors. This makes it easier to debug the calibration process. -*/ -public class msg_sensor_offsets extends MAVLinkMessage{ + * Offsets and calibrations values for hardware sensors. This makes it easier to debug the calibration process. + */ +public class msg_sensor_offsets extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_SENSOR_OFFSETS = 150; public static final int MAVLINK_MSG_LENGTH = 42; private static final long serialVersionUID = MAVLINK_MSG_ID_SENSOR_OFFSETS; - /** - * Magnetic declination. - */ + * Magnetic declination. + */ public float mag_declination; - - /** - * Raw pressure from barometer. - */ - public int raw_press; - - /** - * Raw temperature from barometer. - */ - public int raw_temp; - - /** - * Gyro X calibration. - */ - public float gyro_cal_x; - - /** - * Gyro Y calibration. - */ - public float gyro_cal_y; - - /** - * Gyro Z calibration. - */ - public float gyro_cal_z; - - /** - * Accel X calibration. - */ - public float accel_cal_x; - - /** - * Accel Y calibration. - */ - public float accel_cal_y; - - /** - * Accel Z calibration. - */ - public float accel_cal_z; - - /** - * Magnetometer X offset. - */ - public short mag_ofs_x; - - /** - * Magnetometer Y offset. - */ - public short mag_ofs_y; - - /** - * Magnetometer Z offset. - */ - public short mag_ofs_z; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Raw pressure from barometer. + */ + public int raw_press; + + /** + * Raw temperature from barometer. + */ + public int raw_temp; + + /** + * Gyro X calibration. + */ + public float gyro_cal_x; + + /** + * Gyro Y calibration. + */ + public float gyro_cal_y; + + /** + * Gyro Z calibration. + */ + public float gyro_cal_z; + + /** + * Accel X calibration. + */ + public float accel_cal_x; + + /** + * Accel Y calibration. + */ + public float accel_cal_y; + + /** + * Accel Z calibration. + */ + public float accel_cal_z; + + /** + * Magnetometer X offset. + */ + public short mag_ofs_x; + + /** + * Magnetometer Y offset. + */ + public short mag_ofs_y; + + /** + * Magnetometer Z offset. + */ + public short mag_ofs_z; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_SENSOR_OFFSETS; - + packet.payload.putFloat(mag_declination); - + packet.payload.putInt(raw_press); - + packet.payload.putInt(raw_temp); - + packet.payload.putFloat(gyro_cal_x); - + packet.payload.putFloat(gyro_cal_y); - + packet.payload.putFloat(gyro_cal_z); - + packet.payload.putFloat(accel_cal_x); - + packet.payload.putFloat(accel_cal_y); - + packet.payload.putFloat(accel_cal_z); - + packet.payload.putShort(mag_ofs_x); - + packet.payload.putShort(mag_ofs_y); - + packet.payload.putShort(mag_ofs_z); - + return packet; } /** - * Decode a sensor_offsets message into this class fields - * - * @param payload The message to decode - */ + * Decode a sensor_offsets message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.mag_declination = payload.getFloat(); - + this.raw_press = payload.getInt(); - + this.raw_temp = payload.getInt(); - + this.gyro_cal_x = payload.getFloat(); - + this.gyro_cal_y = payload.getFloat(); - + this.gyro_cal_z = payload.getFloat(); - + this.accel_cal_x = payload.getFloat(); - + this.accel_cal_y = payload.getFloat(); - + this.accel_cal_z = payload.getFloat(); - + this.mag_ofs_x = payload.getShort(); - + this.mag_ofs_y = payload.getShort(); - + this.mag_ofs_z = payload.getShort(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_sensor_offsets(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_sensor_offsets() { msgid = MAVLINK_MSG_ID_SENSOR_OFFSETS; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_sensor_offsets(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_sensor_offsets(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_SENSOR_OFFSETS; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_SENSOR_OFFSETS - sysid:"+sysid+" compid:"+compid+" mag_declination:"+mag_declination+" raw_press:"+raw_press+" raw_temp:"+raw_temp+" gyro_cal_x:"+gyro_cal_x+" gyro_cal_y:"+gyro_cal_y+" gyro_cal_z:"+gyro_cal_z+" accel_cal_x:"+accel_cal_x+" accel_cal_y:"+accel_cal_y+" accel_cal_z:"+accel_cal_z+" mag_ofs_x:"+mag_ofs_x+" mag_ofs_y:"+mag_ofs_y+" mag_ofs_z:"+mag_ofs_z+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_SENSOR_OFFSETS - sysid:" + sysid + " compid:" + compid + " mag_declination:" + mag_declination + " raw_press:" + raw_press + " raw_temp:" + raw_temp + " gyro_cal_x:" + gyro_cal_x + " gyro_cal_y:" + gyro_cal_y + " gyro_cal_z:" + gyro_cal_z + " accel_cal_x:" + accel_cal_x + " accel_cal_y:" + accel_cal_y + " accel_cal_z:" + accel_cal_z + " mag_ofs_x:" + mag_ofs_x + " mag_ofs_y:" + mag_ofs_y + " mag_ofs_z:" + mag_ofs_z + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_set_mag_offsets.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_set_mag_offsets.java index 98bd5fd..851ec8c 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_set_mag_offsets.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_set_mag_offsets.java @@ -6,115 +6,115 @@ // MESSAGE SET_MAG_OFFSETS PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Set the magnetometer offsets -*/ -public class msg_set_mag_offsets extends MAVLinkMessage{ + * Set the magnetometer offsets + */ +public class msg_set_mag_offsets extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_SET_MAG_OFFSETS = 151; public static final int MAVLINK_MSG_LENGTH = 8; private static final long serialVersionUID = MAVLINK_MSG_ID_SET_MAG_OFFSETS; - /** - * Magnetometer X offset. - */ + * Magnetometer X offset. + */ public short mag_ofs_x; - - /** - * Magnetometer Y offset. - */ - public short mag_ofs_y; - - /** - * Magnetometer Z offset. - */ - public short mag_ofs_z; - - /** - * System ID. - */ - public short target_system; - - /** - * Component ID. - */ - public short target_component; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Magnetometer Y offset. + */ + public short mag_ofs_y; + + /** + * Magnetometer Z offset. + */ + public short mag_ofs_z; + + /** + * System ID. + */ + public short target_system; + + /** + * Component ID. + */ + public short target_component; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_SET_MAG_OFFSETS; - + packet.payload.putShort(mag_ofs_x); - + packet.payload.putShort(mag_ofs_y); - + packet.payload.putShort(mag_ofs_z); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + return packet; } /** - * Decode a set_mag_offsets message into this class fields - * - * @param payload The message to decode - */ + * Decode a set_mag_offsets message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.mag_ofs_x = payload.getShort(); - + this.mag_ofs_y = payload.getShort(); - + this.mag_ofs_z = payload.getShort(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_set_mag_offsets(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_set_mag_offsets() { msgid = MAVLINK_MSG_ID_SET_MAG_OFFSETS; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_set_mag_offsets(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_set_mag_offsets(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_SET_MAG_OFFSETS; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_SET_MAG_OFFSETS - sysid:"+sysid+" compid:"+compid+" mag_ofs_x:"+mag_ofs_x+" mag_ofs_y:"+mag_ofs_y+" mag_ofs_z:"+mag_ofs_z+" target_system:"+target_system+" target_component:"+target_component+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_SET_MAG_OFFSETS - sysid:" + sysid + " compid:" + compid + " mag_ofs_x:" + mag_ofs_x + " mag_ofs_y:" + mag_ofs_y + " mag_ofs_z:" + mag_ofs_z + " target_system:" + target_system + " target_component:" + target_component + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_simstate.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_simstate.java index 53d0789..6e47459 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_simstate.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_simstate.java @@ -6,169 +6,169 @@ // MESSAGE SIMSTATE PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Status of simulation environment, if used. -*/ -public class msg_simstate extends MAVLinkMessage{ + * Status of simulation environment, if used. + */ +public class msg_simstate extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_SIMSTATE = 164; public static final int MAVLINK_MSG_LENGTH = 44; private static final long serialVersionUID = MAVLINK_MSG_ID_SIMSTATE; - /** - * Roll angle. - */ + * Roll angle. + */ public float roll; - - /** - * Pitch angle. - */ - public float pitch; - - /** - * Yaw angle. - */ - public float yaw; - - /** - * X acceleration. - */ - public float xacc; - - /** - * Y acceleration. - */ - public float yacc; - - /** - * Z acceleration. - */ - public float zacc; - - /** - * Angular speed around X axis. - */ - public float xgyro; - - /** - * Angular speed around Y axis. - */ - public float ygyro; - - /** - * Angular speed around Z axis. - */ - public float zgyro; - - /** - * Latitude. - */ - public int lat; - - /** - * Longitude. - */ - public int lng; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Pitch angle. + */ + public float pitch; + + /** + * Yaw angle. + */ + public float yaw; + + /** + * X acceleration. + */ + public float xacc; + + /** + * Y acceleration. + */ + public float yacc; + + /** + * Z acceleration. + */ + public float zacc; + + /** + * Angular speed around X axis. + */ + public float xgyro; + + /** + * Angular speed around Y axis. + */ + public float ygyro; + + /** + * Angular speed around Z axis. + */ + public float zgyro; + + /** + * Latitude. + */ + public int lat; + + /** + * Longitude. + */ + public int lng; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_SIMSTATE; - + packet.payload.putFloat(roll); - + packet.payload.putFloat(pitch); - + packet.payload.putFloat(yaw); - + packet.payload.putFloat(xacc); - + packet.payload.putFloat(yacc); - + packet.payload.putFloat(zacc); - + packet.payload.putFloat(xgyro); - + packet.payload.putFloat(ygyro); - + packet.payload.putFloat(zgyro); - + packet.payload.putInt(lat); - + packet.payload.putInt(lng); - + return packet; } /** - * Decode a simstate message into this class fields - * - * @param payload The message to decode - */ + * Decode a simstate message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.roll = payload.getFloat(); - + this.pitch = payload.getFloat(); - + this.yaw = payload.getFloat(); - + this.xacc = payload.getFloat(); - + this.yacc = payload.getFloat(); - + this.zacc = payload.getFloat(); - + this.xgyro = payload.getFloat(); - + this.ygyro = payload.getFloat(); - + this.zgyro = payload.getFloat(); - + this.lat = payload.getInt(); - + this.lng = payload.getInt(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_simstate(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_simstate() { msgid = MAVLINK_MSG_ID_SIMSTATE; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_simstate(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_simstate(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_SIMSTATE; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_SIMSTATE - sysid:"+sysid+" compid:"+compid+" roll:"+roll+" pitch:"+pitch+" yaw:"+yaw+" xacc:"+xacc+" yacc:"+yacc+" zacc:"+zacc+" xgyro:"+xgyro+" ygyro:"+ygyro+" zgyro:"+zgyro+" lat:"+lat+" lng:"+lng+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_SIMSTATE - sysid:" + sysid + " compid:" + compid + " roll:" + roll + " pitch:" + pitch + " yaw:" + yaw + " xacc:" + xacc + " yacc:" + yacc + " zacc:" + zacc + " xgyro:" + xgyro + " ygyro:" + ygyro + " zgyro:" + zgyro + " lat:" + lat + " lng:" + lng + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_vision_position_delta.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_vision_position_delta.java index 584e4ad..9e32aca 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_vision_position_delta.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_vision_position_delta.java @@ -6,131 +6,129 @@ // MESSAGE VISION_POSITION_DELTA PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Camera vision based attitude and position deltas. -*/ -public class msg_vision_position_delta extends MAVLinkMessage{ + * Camera vision based attitude and position deltas. + */ +public class msg_vision_position_delta extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_VISION_POSITION_DELTA = 11011; public static final int MAVLINK_MSG_LENGTH = 44; private static final long serialVersionUID = MAVLINK_MSG_ID_VISION_POSITION_DELTA; - /** - * Timestamp (synced to UNIX time or since system boot). - */ + * Timestamp (synced to UNIX time or since system boot). + */ public long time_usec; - - /** - * Time since the last reported camera frame. - */ - public long time_delta_usec; - - /** - * Defines a rotation vector in body frame that rotates the vehicle from the previous to the current orientation. - */ - public float angle_delta[] = new float[3]; - - /** - * Change in position from previous to current frame rotated into body frame (0=forward, 1=right, 2=down). - */ - public float position_delta[] = new float[3]; - - /** - * Normalised confidence value from 0 to 100. - */ - public float confidence; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Time since the last reported camera frame. + */ + public long time_delta_usec; + + /** + * Defines a rotation vector in body frame that rotates the vehicle from the previous to the current orientation. + */ + public float angle_delta[] = new float[3]; + + /** + * Change in position from previous to current frame rotated into body frame (0=forward, 1=right, 2=down). + */ + public float position_delta[] = new float[3]; + + /** + * Normalised confidence value from 0 to 100. + */ + public float confidence; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_VISION_POSITION_DELTA; - + packet.payload.putUnsignedLong(time_usec); - + packet.payload.putUnsignedLong(time_delta_usec); - - + + for (int i = 0; i < angle_delta.length; i++) { packet.payload.putFloat(angle_delta[i]); } - - - + + for (int i = 0; i < position_delta.length; i++) { packet.payload.putFloat(position_delta[i]); } - - + + packet.payload.putFloat(confidence); - + return packet; } /** - * Decode a vision_position_delta message into this class fields - * - * @param payload The message to decode - */ + * Decode a vision_position_delta message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.time_usec = payload.getUnsignedLong(); - + this.time_delta_usec = payload.getUnsignedLong(); - - + + for (int i = 0; i < this.angle_delta.length; i++) { this.angle_delta[i] = payload.getFloat(); } - - - + + for (int i = 0; i < this.position_delta.length; i++) { this.position_delta[i] = payload.getFloat(); } - - + + this.confidence = payload.getFloat(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_vision_position_delta(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_vision_position_delta() { msgid = MAVLINK_MSG_ID_VISION_POSITION_DELTA; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_vision_position_delta(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_vision_position_delta(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_VISION_POSITION_DELTA; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_VISION_POSITION_DELTA - sysid:"+sysid+" compid:"+compid+" time_usec:"+time_usec+" time_delta_usec:"+time_delta_usec+" angle_delta:"+angle_delta+" position_delta:"+position_delta+" confidence:"+confidence+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_VISION_POSITION_DELTA - sysid:" + sysid + " compid:" + compid + " time_usec:" + time_usec + " time_delta_usec:" + time_delta_usec + " angle_delta:" + angle_delta + " position_delta:" + position_delta + " confidence:" + confidence + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/ardupilotmega/msg_wind.java b/app/src/main/java/com/MAVLink/ardupilotmega/msg_wind.java index 175f4f1..7aff3e8 100644 --- a/app/src/main/java/com/MAVLink/ardupilotmega/msg_wind.java +++ b/app/src/main/java/com/MAVLink/ardupilotmega/msg_wind.java @@ -6,97 +6,97 @@ // MESSAGE WIND PACKING package com.MAVLink.ardupilotmega; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Wind estimation. -*/ -public class msg_wind extends MAVLinkMessage{ + * Wind estimation. + */ +public class msg_wind extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_WIND = 168; public static final int MAVLINK_MSG_LENGTH = 12; private static final long serialVersionUID = MAVLINK_MSG_ID_WIND; - /** - * Wind direction (that wind is coming from). - */ + * Wind direction (that wind is coming from). + */ public float direction; - - /** - * Wind speed in ground plane. - */ - public float speed; - - /** - * Vertical wind speed. - */ - public float speed_z; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Wind speed in ground plane. + */ + public float speed; + + /** + * Vertical wind speed. + */ + public float speed_z; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_WIND; - + packet.payload.putFloat(direction); - + packet.payload.putFloat(speed); - + packet.payload.putFloat(speed_z); - + return packet; } /** - * Decode a wind message into this class fields - * - * @param payload The message to decode - */ + * Decode a wind message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.direction = payload.getFloat(); - + this.speed = payload.getFloat(); - + this.speed_z = payload.getFloat(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_wind(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_wind() { msgid = MAVLINK_MSG_ID_WIND; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_wind(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_wind(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_WIND; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_WIND - sysid:"+sysid+" compid:"+compid+" direction:"+direction+" speed:"+speed+" speed_z:"+speed_z+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_WIND - sysid:" + sysid + " compid:" + compid + " direction:" + direction + " speed:" + speed + " speed_z:" + speed_z + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/common/CRC.java b/app/src/main/java/com/MAVLink/common/CRC.java index b6f2ab2..4892260 100644 --- a/app/src/main/java/com/MAVLink/common/CRC.java +++ b/app/src/main/java/com/MAVLink/common/CRC.java @@ -7,26 +7,24 @@ package com.MAVLink.common; /** -* X.25 CRC calculation for MAVlink messages. The checksum must be initialized, -* updated with witch field of the message, and then finished with the message -* id. -* -*/ + * X.25 CRC calculation for MAVlink messages. The checksum must be initialized, + * updated with witch field of the message, and then finished with the message + * id. + */ public class CRC { private static final int[] MAVLINK_MESSAGE_CRCS = {50, 124, 137, 0, 237, 217, 104, 119, 117, 0, 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, 214, 159, 220, 168, 24, 23, 170, 144, 67, 115, 39, 246, 185, 104, 237, 244, 222, 212, 9, 254, 230, 28, 28, 132, 221, 232, 11, 153, 41, 39, 78, 196, 132, 0, 15, 3, 0, 0, 0, 0, 0, 167, 183, 119, 191, 118, 148, 21, 0, 243, 124, 0, 0, 38, 20, 158, 152, 143, 0, 0, 0, 106, 49, 22, 143, 140, 5, 150, 0, 231, 183, 63, 54, 47, 0, 0, 0, 0, 0, 0, 175, 102, 158, 208, 56, 93, 138, 108, 32, 185, 84, 34, 174, 124, 237, 4, 76, 128, 56, 116, 134, 237, 203, 250, 87, 203, 220, 25, 226, 46, 29, 223, 85, 6, 229, 203, 1, 195, 109, 168, 181, 47, 72, 131, 127, 0, 103, 154, 178, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 163, 105, 151, 35, 150, 179, 0, 0, 0, 0, 0, 90, 104, 85, 95, 130, 184, 81, 8, 204, 49, 170, 44, 83, 46, 0}; private static final int CRC_INIT_VALUE = 0xffff; private int crcValue; /** - * Accumulate the X.25 CRC by adding one char at a time. - * - * The checksum function adds the hash of one char at a time to the 16 bit - * checksum (uint16_t). - * - * @param data - * new char to hash - **/ - public void update_checksum(int data) { + * Accumulate the X.25 CRC by adding one char at a time. + *

+ * The checksum function adds the hash of one char at a time to the 16 bit + * checksum (uint16_t). + * + * @param data new char to hash + **/ + public void update_checksum(int data) { data = data & 0xff; //cast because we want an unsigned type int tmp = data ^ (crcValue & 0xff); tmp ^= (tmp << 4) & 0xff; @@ -34,20 +32,18 @@ public class CRC { } /** - * Finish the CRC calculation of a message, by running the CRC with the - * Magic Byte. This Magic byte has been defined in MAVlink v1.0. - * - * @param msgid - * The message id number - */ + * Finish the CRC calculation of a message, by running the CRC with the + * Magic Byte. This Magic byte has been defined in MAVlink v1.0. + * + * @param msgid The message id number + */ public void finish_checksum(int msgid) { update_checksum(MAVLINK_MESSAGE_CRCS[msgid]); } /** - * Initialize the buffer for the X.25 CRC - * - */ + * Initialize the buffer for the X.25 CRC + */ public void start_checksum() { crcValue = CRC_INIT_VALUE; } diff --git a/app/src/main/java/com/MAVLink/common/msg_actuator_control_target.java b/app/src/main/java/com/MAVLink/common/msg_actuator_control_target.java index 57ff8e2..287433e 100644 --- a/app/src/main/java/com/MAVLink/common/msg_actuator_control_target.java +++ b/app/src/main/java/com/MAVLink/common/msg_actuator_control_target.java @@ -6,105 +6,105 @@ // MESSAGE ACTUATOR_CONTROL_TARGET PACKING package com.MAVLink.common; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Set the vehicle attitude and body angular rates. -*/ -public class msg_actuator_control_target extends MAVLinkMessage{ + * Set the vehicle attitude and body angular rates. + */ +public class msg_actuator_control_target extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_ACTUATOR_CONTROL_TARGET = 140; public static final int MAVLINK_MSG_LENGTH = 41; private static final long serialVersionUID = MAVLINK_MSG_ID_ACTUATOR_CONTROL_TARGET; - /** - * Timestamp (UNIX Epoch time or time since system boot). The receiving end can infer timestamp format (since 1.1.1970 or since system boot) by checking for the magnitude the number. - */ + * Timestamp (UNIX Epoch time or time since system boot). The receiving end can infer timestamp format (since 1.1.1970 or since system boot) by checking for the magnitude the number. + */ public long time_usec; - - /** - * Actuator controls. Normed to -1..+1 where 0 is neutral position. Throttle for single rotation direction motors is 0..1, negative range for reverse direction. Standard mapping for attitude controls (group 0): (index 0-7): roll, pitch, yaw, throttle, flaps, spoilers, airbrakes, landing gear. Load a pass-through mixer to repurpose them as generic outputs. - */ - public float controls[] = new float[8]; - - /** - * Actuator group. The "_mlx" indicates this is a multi-instance message and a MAVLink parser should use this field to difference between instances. - */ - public short group_mlx; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Actuator controls. Normed to -1..+1 where 0 is neutral position. Throttle for single rotation direction motors is 0..1, negative range for reverse direction. Standard mapping for attitude controls (group 0): (index 0-7): roll, pitch, yaw, throttle, flaps, spoilers, airbrakes, landing gear. Load a pass-through mixer to repurpose them as generic outputs. + */ + public float controls[] = new float[8]; + + /** + * Actuator group. The "_mlx" indicates this is a multi-instance message and a MAVLink parser should use this field to difference between instances. + */ + public short group_mlx; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_ACTUATOR_CONTROL_TARGET; - + packet.payload.putUnsignedLong(time_usec); - - + + for (int i = 0; i < controls.length; i++) { packet.payload.putFloat(controls[i]); } - - + + packet.payload.putUnsignedByte(group_mlx); - + return packet; } /** - * Decode a actuator_control_target message into this class fields - * - * @param payload The message to decode - */ + * Decode a actuator_control_target message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.time_usec = payload.getUnsignedLong(); - - + + for (int i = 0; i < this.controls.length; i++) { this.controls[i] = payload.getFloat(); } - - + + this.group_mlx = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_actuator_control_target(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_actuator_control_target() { msgid = MAVLINK_MSG_ID_ACTUATOR_CONTROL_TARGET; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_actuator_control_target(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_actuator_control_target(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_ACTUATOR_CONTROL_TARGET; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_ACTUATOR_CONTROL_TARGET - sysid:"+sysid+" compid:"+compid+" time_usec:"+time_usec+" controls:"+controls+" group_mlx:"+group_mlx+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_ACTUATOR_CONTROL_TARGET - sysid:" + sysid + " compid:" + compid + " time_usec:" + time_usec + " controls:" + controls + " group_mlx:" + group_mlx + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/common/msg_actuator_output_status.java b/app/src/main/java/com/MAVLink/common/msg_actuator_output_status.java index 8c6a861..13a9388 100644 --- a/app/src/main/java/com/MAVLink/common/msg_actuator_output_status.java +++ b/app/src/main/java/com/MAVLink/common/msg_actuator_output_status.java @@ -6,105 +6,105 @@ // MESSAGE ACTUATOR_OUTPUT_STATUS PACKING package com.MAVLink.common; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* The raw values of the actuator outputs (e.g. on Pixhawk, from MAIN, AUX ports). This message supersedes SERVO_OUTPUT_RAW. -*/ -public class msg_actuator_output_status extends MAVLinkMessage{ + * The raw values of the actuator outputs (e.g. on Pixhawk, from MAIN, AUX ports). This message supersedes SERVO_OUTPUT_RAW. + */ +public class msg_actuator_output_status extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_ACTUATOR_OUTPUT_STATUS = 375; public static final int MAVLINK_MSG_LENGTH = 140; private static final long serialVersionUID = MAVLINK_MSG_ID_ACTUATOR_OUTPUT_STATUS; - /** - * Timestamp (since system boot). - */ + * Timestamp (since system boot). + */ public long time_usec; - - /** - * Active outputs - */ - public long active; - - /** - * Servo / motor output array values. Zero values indicate unused channels. - */ - public float actuator[] = new float[32]; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Active outputs + */ + public long active; + + /** + * Servo / motor output array values. Zero values indicate unused channels. + */ + public float actuator[] = new float[32]; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_ACTUATOR_OUTPUT_STATUS; - + packet.payload.putUnsignedLong(time_usec); - + packet.payload.putUnsignedInt(active); - - + + for (int i = 0; i < actuator.length; i++) { packet.payload.putFloat(actuator[i]); } - - + + return packet; } /** - * Decode a actuator_output_status message into this class fields - * - * @param payload The message to decode - */ + * Decode a actuator_output_status message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.time_usec = payload.getUnsignedLong(); - + this.active = payload.getUnsignedInt(); - - + + for (int i = 0; i < this.actuator.length; i++) { this.actuator[i] = payload.getFloat(); } - - + + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_actuator_output_status(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_actuator_output_status() { msgid = MAVLINK_MSG_ID_ACTUATOR_OUTPUT_STATUS; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_actuator_output_status(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_actuator_output_status(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_ACTUATOR_OUTPUT_STATUS; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_ACTUATOR_OUTPUT_STATUS - sysid:"+sysid+" compid:"+compid+" time_usec:"+time_usec+" active:"+active+" actuator:"+actuator+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_ACTUATOR_OUTPUT_STATUS - sysid:" + sysid + " compid:" + compid + " time_usec:" + time_usec + " active:" + active + " actuator:" + actuator + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/common/msg_adsb_vehicle.java b/app/src/main/java/com/MAVLink/common/msg_adsb_vehicle.java index 353a106..f72bdd4 100644 --- a/app/src/main/java/com/MAVLink/common/msg_adsb_vehicle.java +++ b/app/src/main/java/com/MAVLink/common/msg_adsb_vehicle.java @@ -6,207 +6,207 @@ // MESSAGE ADSB_VEHICLE PACKING package com.MAVLink.common; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* The location and information of an ADSB vehicle -*/ -public class msg_adsb_vehicle extends MAVLinkMessage{ + * The location and information of an ADSB vehicle + */ +public class msg_adsb_vehicle extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_ADSB_VEHICLE = 246; public static final int MAVLINK_MSG_LENGTH = 38; private static final long serialVersionUID = MAVLINK_MSG_ID_ADSB_VEHICLE; - /** - * ICAO address - */ + * ICAO address + */ public long ICAO_address; - - /** - * Latitude - */ - public int lat; - - /** - * Longitude - */ - public int lon; - - /** - * Altitude(ASL) - */ - public int altitude; - - /** - * Course over ground - */ - public int heading; - - /** - * The horizontal velocity - */ - public int hor_velocity; - - /** - * The vertical velocity. Positive is up - */ - public short ver_velocity; - - /** - * Bitmap to indicate various statuses including valid data fields - */ - public int flags; - - /** - * Squawk code - */ - public int squawk; - - /** - * ADSB altitude type. - */ - public short altitude_type; - - /** - * The callsign, 8+null - */ - public byte callsign[] = new byte[9]; - - /** - * ADSB emitter type. - */ - public short emitter_type; - - /** - * Time since last communication in seconds - */ - public short tslc; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Latitude + */ + public int lat; + + /** + * Longitude + */ + public int lon; + + /** + * Altitude(ASL) + */ + public int altitude; + + /** + * Course over ground + */ + public int heading; + + /** + * The horizontal velocity + */ + public int hor_velocity; + + /** + * The vertical velocity. Positive is up + */ + public short ver_velocity; + + /** + * Bitmap to indicate various statuses including valid data fields + */ + public int flags; + + /** + * Squawk code + */ + public int squawk; + + /** + * ADSB altitude type. + */ + public short altitude_type; + + /** + * The callsign, 8+null + */ + public byte callsign[] = new byte[9]; + + /** + * ADSB emitter type. + */ + public short emitter_type; + + /** + * Time since last communication in seconds + */ + public short tslc; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_ADSB_VEHICLE; - + packet.payload.putUnsignedInt(ICAO_address); - + packet.payload.putInt(lat); - + packet.payload.putInt(lon); - + packet.payload.putInt(altitude); - + packet.payload.putUnsignedShort(heading); - + packet.payload.putUnsignedShort(hor_velocity); - + packet.payload.putShort(ver_velocity); - + packet.payload.putUnsignedShort(flags); - + packet.payload.putUnsignedShort(squawk); - + packet.payload.putUnsignedByte(altitude_type); - - + + for (int i = 0; i < callsign.length; i++) { packet.payload.putByte(callsign[i]); } - - + + packet.payload.putUnsignedByte(emitter_type); - + packet.payload.putUnsignedByte(tslc); - + return packet; } /** - * Decode a adsb_vehicle message into this class fields - * - * @param payload The message to decode - */ + * Decode a adsb_vehicle message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.ICAO_address = payload.getUnsignedInt(); - + this.lat = payload.getInt(); - + this.lon = payload.getInt(); - + this.altitude = payload.getInt(); - + this.heading = payload.getUnsignedShort(); - + this.hor_velocity = payload.getUnsignedShort(); - + this.ver_velocity = payload.getShort(); - + this.flags = payload.getUnsignedShort(); - + this.squawk = payload.getUnsignedShort(); - + this.altitude_type = payload.getUnsignedByte(); - - + + for (int i = 0; i < this.callsign.length; i++) { this.callsign[i] = payload.getByte(); } - - + + this.emitter_type = payload.getUnsignedByte(); - + this.tslc = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_adsb_vehicle(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_adsb_vehicle() { msgid = MAVLINK_MSG_ID_ADSB_VEHICLE; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_adsb_vehicle(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_adsb_vehicle(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_ADSB_VEHICLE; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Sets the buffer of this message with a string, adds the necessary padding - */ + * Sets the buffer of this message with a string, adds the necessary padding + */ public void setCallsign(String str) { int len = Math.min(str.length(), 9); - for (int i=0; i 0 indicates the interval at which it is sent. - */ + * The interval between two messages. A value of -1 indicates this stream is disabled, 0 indicates it is not available, > 0 indicates the interval at which it is sent. + */ public int interval_us; - - /** - * The ID of the requested MAVLink message. v1.0 is limited to 254 messages. - */ - public int message_id; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * The ID of the requested MAVLink message. v1.0 is limited to 254 messages. + */ + public int message_id; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MESSAGE_INTERVAL; - + packet.payload.putInt(interval_us); - + packet.payload.putUnsignedShort(message_id); - + return packet; } /** - * Decode a message_interval message into this class fields - * - * @param payload The message to decode - */ + * Decode a message_interval message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.interval_us = payload.getInt(); - + this.message_id = payload.getUnsignedShort(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_message_interval(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_message_interval() { msgid = MAVLINK_MSG_ID_MESSAGE_INTERVAL; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_message_interval(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_message_interval(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MESSAGE_INTERVAL; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MESSAGE_INTERVAL - sysid:"+sysid+" compid:"+compid+" interval_us:"+interval_us+" message_id:"+message_id+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MESSAGE_INTERVAL - sysid:" + sysid + " compid:" + compid + " interval_us:" + interval_us + " message_id:" + message_id + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/common/msg_mission_ack.java b/app/src/main/java/com/MAVLink/common/msg_mission_ack.java index 9dad49c..eae8ab5 100644 --- a/app/src/main/java/com/MAVLink/common/msg_mission_ack.java +++ b/app/src/main/java/com/MAVLink/common/msg_mission_ack.java @@ -6,106 +6,106 @@ // MESSAGE MISSION_ACK PACKING package com.MAVLink.common; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Acknowledgment message during waypoint handling. The type field states if this message is a positive ack (type=0) or if an error happened (type=non-zero). -*/ -public class msg_mission_ack extends MAVLinkMessage{ + * Acknowledgment message during waypoint handling. The type field states if this message is a positive ack (type=0) or if an error happened (type=non-zero). + */ +public class msg_mission_ack extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MISSION_ACK = 47; public static final int MAVLINK_MSG_LENGTH = 4; private static final long serialVersionUID = MAVLINK_MSG_ID_MISSION_ACK; - /** - * System ID - */ + * System ID + */ public short target_system; - - /** - * Component ID - */ - public short target_component; - - /** - * Mission result. - */ - public short type; - - /** - * Mission type. - */ - public short mission_type; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Component ID + */ + public short target_component; + + /** + * Mission result. + */ + public short type; + + /** + * Mission type. + */ + public short mission_type; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MISSION_ACK; - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + packet.payload.putUnsignedByte(type); - + packet.payload.putUnsignedByte(mission_type); - + return packet; } /** - * Decode a mission_ack message into this class fields - * - * @param payload The message to decode - */ + * Decode a mission_ack message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + this.type = payload.getUnsignedByte(); - + this.mission_type = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_mission_ack(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_mission_ack() { msgid = MAVLINK_MSG_ID_MISSION_ACK; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_mission_ack(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_mission_ack(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MISSION_ACK; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MISSION_ACK - sysid:"+sysid+" compid:"+compid+" target_system:"+target_system+" target_component:"+target_component+" type:"+type+" mission_type:"+mission_type+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MISSION_ACK - sysid:" + sysid + " compid:" + compid + " target_system:" + target_system + " target_component:" + target_component + " type:" + type + " mission_type:" + mission_type + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/common/msg_mission_changed.java b/app/src/main/java/com/MAVLink/common/msg_mission_changed.java index 50ec906..7669b56 100644 --- a/app/src/main/java/com/MAVLink/common/msg_mission_changed.java +++ b/app/src/main/java/com/MAVLink/common/msg_mission_changed.java @@ -6,115 +6,115 @@ // MESSAGE MISSION_CHANGED PACKING package com.MAVLink.common; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* A broadcast message to notify any ground station or SDK if a mission, geofence or safe points have changed on the vehicle. -*/ -public class msg_mission_changed extends MAVLinkMessage{ + * A broadcast message to notify any ground station or SDK if a mission, geofence or safe points have changed on the vehicle. + */ +public class msg_mission_changed extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MISSION_CHANGED = 52; public static final int MAVLINK_MSG_LENGTH = 7; private static final long serialVersionUID = MAVLINK_MSG_ID_MISSION_CHANGED; - /** - * Start index for partial mission change (-1 for all items). - */ + * Start index for partial mission change (-1 for all items). + */ public short start_index; - - /** - * End index of a partial mission change. -1 is a synonym for the last mission item (i.e. selects all items from start_index). Ignore field if start_index=-1. - */ - public short end_index; - - /** - * System ID of the author of the new mission. - */ - public short origin_sysid; - - /** - * Compnent ID of the author of the new mission. - */ - public short origin_compid; - - /** - * Mission type. - */ - public short mission_type; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * End index of a partial mission change. -1 is a synonym for the last mission item (i.e. selects all items from start_index). Ignore field if start_index=-1. + */ + public short end_index; + + /** + * System ID of the author of the new mission. + */ + public short origin_sysid; + + /** + * Compnent ID of the author of the new mission. + */ + public short origin_compid; + + /** + * Mission type. + */ + public short mission_type; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MISSION_CHANGED; - + packet.payload.putShort(start_index); - + packet.payload.putShort(end_index); - + packet.payload.putUnsignedByte(origin_sysid); - + packet.payload.putUnsignedByte(origin_compid); - + packet.payload.putUnsignedByte(mission_type); - + return packet; } /** - * Decode a mission_changed message into this class fields - * - * @param payload The message to decode - */ + * Decode a mission_changed message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.start_index = payload.getShort(); - + this.end_index = payload.getShort(); - + this.origin_sysid = payload.getUnsignedByte(); - + this.origin_compid = payload.getUnsignedByte(); - + this.mission_type = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_mission_changed(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_mission_changed() { msgid = MAVLINK_MSG_ID_MISSION_CHANGED; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_mission_changed(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_mission_changed(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MISSION_CHANGED; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MISSION_CHANGED - sysid:"+sysid+" compid:"+compid+" start_index:"+start_index+" end_index:"+end_index+" origin_sysid:"+origin_sysid+" origin_compid:"+origin_compid+" mission_type:"+mission_type+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MISSION_CHANGED - sysid:" + sysid + " compid:" + compid + " start_index:" + start_index + " end_index:" + end_index + " origin_sysid:" + origin_sysid + " origin_compid:" + origin_compid + " mission_type:" + mission_type + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/common/msg_mission_clear_all.java b/app/src/main/java/com/MAVLink/common/msg_mission_clear_all.java index eb1ad8e..9a3c4ca 100644 --- a/app/src/main/java/com/MAVLink/common/msg_mission_clear_all.java +++ b/app/src/main/java/com/MAVLink/common/msg_mission_clear_all.java @@ -6,97 +6,97 @@ // MESSAGE MISSION_CLEAR_ALL PACKING package com.MAVLink.common; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Delete all mission items at once. -*/ -public class msg_mission_clear_all extends MAVLinkMessage{ + * Delete all mission items at once. + */ +public class msg_mission_clear_all extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MISSION_CLEAR_ALL = 45; public static final int MAVLINK_MSG_LENGTH = 3; private static final long serialVersionUID = MAVLINK_MSG_ID_MISSION_CLEAR_ALL; - /** - * System ID - */ + * System ID + */ public short target_system; - - /** - * Component ID - */ - public short target_component; - - /** - * Mission type. - */ - public short mission_type; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Component ID + */ + public short target_component; + + /** + * Mission type. + */ + public short mission_type; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MISSION_CLEAR_ALL; - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + packet.payload.putUnsignedByte(mission_type); - + return packet; } /** - * Decode a mission_clear_all message into this class fields - * - * @param payload The message to decode - */ + * Decode a mission_clear_all message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + this.mission_type = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_mission_clear_all(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_mission_clear_all() { msgid = MAVLINK_MSG_ID_MISSION_CLEAR_ALL; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_mission_clear_all(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_mission_clear_all(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MISSION_CLEAR_ALL; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MISSION_CLEAR_ALL - sysid:"+sysid+" compid:"+compid+" target_system:"+target_system+" target_component:"+target_component+" mission_type:"+mission_type+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MISSION_CLEAR_ALL - sysid:" + sysid + " compid:" + compid + " target_system:" + target_system + " target_component:" + target_component + " mission_type:" + mission_type + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/common/msg_mission_count.java b/app/src/main/java/com/MAVLink/common/msg_mission_count.java index 0793334..33b294d 100644 --- a/app/src/main/java/com/MAVLink/common/msg_mission_count.java +++ b/app/src/main/java/com/MAVLink/common/msg_mission_count.java @@ -6,106 +6,106 @@ // MESSAGE MISSION_COUNT PACKING package com.MAVLink.common; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* This message is emitted as response to MISSION_REQUEST_LIST by the MAV and to initiate a write transaction. The GCS can then request the individual mission item based on the knowledge of the total number of waypoints. -*/ -public class msg_mission_count extends MAVLinkMessage{ + * This message is emitted as response to MISSION_REQUEST_LIST by the MAV and to initiate a write transaction. The GCS can then request the individual mission item based on the knowledge of the total number of waypoints. + */ +public class msg_mission_count extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MISSION_COUNT = 44; public static final int MAVLINK_MSG_LENGTH = 5; private static final long serialVersionUID = MAVLINK_MSG_ID_MISSION_COUNT; - /** - * Number of mission items in the sequence - */ + * Number of mission items in the sequence + */ public int count; - - /** - * System ID - */ - public short target_system; - - /** - * Component ID - */ - public short target_component; - - /** - * Mission type. - */ - public short mission_type; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * System ID + */ + public short target_system; + + /** + * Component ID + */ + public short target_component; + + /** + * Mission type. + */ + public short mission_type; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MISSION_COUNT; - + packet.payload.putUnsignedShort(count); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + packet.payload.putUnsignedByte(mission_type); - + return packet; } /** - * Decode a mission_count message into this class fields - * - * @param payload The message to decode - */ + * Decode a mission_count message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.count = payload.getUnsignedShort(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + this.mission_type = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_mission_count(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_mission_count() { msgid = MAVLINK_MSG_ID_MISSION_COUNT; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_mission_count(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_mission_count(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MISSION_COUNT; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MISSION_COUNT - sysid:"+sysid+" compid:"+compid+" count:"+count+" target_system:"+target_system+" target_component:"+target_component+" mission_type:"+mission_type+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MISSION_COUNT - sysid:" + sysid + " compid:" + compid + " count:" + count + " target_system:" + target_system + " target_component:" + target_component + " mission_type:" + mission_type + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/common/msg_mission_current.java b/app/src/main/java/com/MAVLink/common/msg_mission_current.java index 632e324..3bf2c9e 100644 --- a/app/src/main/java/com/MAVLink/common/msg_mission_current.java +++ b/app/src/main/java/com/MAVLink/common/msg_mission_current.java @@ -6,79 +6,79 @@ // MESSAGE MISSION_CURRENT PACKING package com.MAVLink.common; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Message that announces the sequence number of the current active mission item. The MAV will fly towards this mission item. -*/ -public class msg_mission_current extends MAVLinkMessage{ + * Message that announces the sequence number of the current active mission item. The MAV will fly towards this mission item. + */ +public class msg_mission_current extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MISSION_CURRENT = 42; public static final int MAVLINK_MSG_LENGTH = 2; private static final long serialVersionUID = MAVLINK_MSG_ID_MISSION_CURRENT; - /** - * Sequence - */ + * Sequence + */ public int seq; - + /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MISSION_CURRENT; - + packet.payload.putUnsignedShort(seq); - + return packet; } /** - * Decode a mission_current message into this class fields - * - * @param payload The message to decode - */ + * Decode a mission_current message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.seq = payload.getUnsignedShort(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_mission_current(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_mission_current() { msgid = MAVLINK_MSG_ID_MISSION_CURRENT; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_mission_current(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_mission_current(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MISSION_CURRENT; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MISSION_CURRENT - sysid:"+sysid+" compid:"+compid+" seq:"+seq+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MISSION_CURRENT - sysid:" + sysid + " compid:" + compid + " seq:" + seq + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/common/msg_mission_item.java b/app/src/main/java/com/MAVLink/common/msg_mission_item.java index ee476b8..099a0b7 100644 --- a/app/src/main/java/com/MAVLink/common/msg_mission_item.java +++ b/app/src/main/java/com/MAVLink/common/msg_mission_item.java @@ -6,206 +6,206 @@ // MESSAGE MISSION_ITEM PACKING package com.MAVLink.common; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Message encoding a mission item. This message is emitted to announce - the presence of a mission item and to set a mission item on the system. The mission item can be either in x, y, z meters (type: LOCAL) or x:lat, y:lon, z:altitude. Local frame is Z-down, right handed (NED), global frame is Z-up, right handed (ENU). See also https://mavlink.io/en/services/mission.html. -*/ -public class msg_mission_item extends MAVLinkMessage{ + * Message encoding a mission item. This message is emitted to announce + * the presence of a mission item and to set a mission item on the system. The mission item can be either in x, y, z meters (type: LOCAL) or x:lat, y:lon, z:altitude. Local frame is Z-down, right handed (NED), global frame is Z-up, right handed (ENU). See also https://mavlink.io/en/services/mission.html. + */ +public class msg_mission_item extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MISSION_ITEM = 39; public static final int MAVLINK_MSG_LENGTH = 38; private static final long serialVersionUID = MAVLINK_MSG_ID_MISSION_ITEM; - /** - * PARAM1, see MAV_CMD enum - */ + * PARAM1, see MAV_CMD enum + */ public float param1; - - /** - * PARAM2, see MAV_CMD enum - */ - public float param2; - - /** - * PARAM3, see MAV_CMD enum - */ - public float param3; - - /** - * PARAM4, see MAV_CMD enum - */ - public float param4; - - /** - * PARAM5 / local: X coordinate, global: latitude - */ - public float x; - - /** - * PARAM6 / local: Y coordinate, global: longitude - */ - public float y; - - /** - * PARAM7 / local: Z coordinate, global: altitude (relative or absolute, depending on frame). - */ - public float z; - - /** - * Sequence - */ - public int seq; - - /** - * The scheduled action for the waypoint. - */ - public int command; - - /** - * System ID - */ - public short target_system; - - /** - * Component ID - */ - public short target_component; - - /** - * The coordinate system of the waypoint. - */ - public short frame; - - /** - * false:0, true:1 - */ - public short current; - - /** - * Autocontinue to next waypoint - */ - public short autocontinue; - - /** - * Mission type. - */ - public short mission_type; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * PARAM2, see MAV_CMD enum + */ + public float param2; + + /** + * PARAM3, see MAV_CMD enum + */ + public float param3; + + /** + * PARAM4, see MAV_CMD enum + */ + public float param4; + + /** + * PARAM5 / local: X coordinate, global: latitude + */ + public float x; + + /** + * PARAM6 / local: Y coordinate, global: longitude + */ + public float y; + + /** + * PARAM7 / local: Z coordinate, global: altitude (relative or absolute, depending on frame). + */ + public float z; + + /** + * Sequence + */ + public int seq; + + /** + * The scheduled action for the waypoint. + */ + public int command; + + /** + * System ID + */ + public short target_system; + + /** + * Component ID + */ + public short target_component; + + /** + * The coordinate system of the waypoint. + */ + public short frame; + + /** + * false:0, true:1 + */ + public short current; + + /** + * Autocontinue to next waypoint + */ + public short autocontinue; + + /** + * Mission type. + */ + public short mission_type; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MISSION_ITEM; - + packet.payload.putFloat(param1); - + packet.payload.putFloat(param2); - + packet.payload.putFloat(param3); - + packet.payload.putFloat(param4); - + packet.payload.putFloat(x); - + packet.payload.putFloat(y); - + packet.payload.putFloat(z); - + packet.payload.putUnsignedShort(seq); - + packet.payload.putUnsignedShort(command); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + packet.payload.putUnsignedByte(frame); - + packet.payload.putUnsignedByte(current); - + packet.payload.putUnsignedByte(autocontinue); - + packet.payload.putUnsignedByte(mission_type); - + return packet; } /** - * Decode a mission_item message into this class fields - * - * @param payload The message to decode - */ + * Decode a mission_item message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.param1 = payload.getFloat(); - + this.param2 = payload.getFloat(); - + this.param3 = payload.getFloat(); - + this.param4 = payload.getFloat(); - + this.x = payload.getFloat(); - + this.y = payload.getFloat(); - + this.z = payload.getFloat(); - + this.seq = payload.getUnsignedShort(); - + this.command = payload.getUnsignedShort(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + this.frame = payload.getUnsignedByte(); - + this.current = payload.getUnsignedByte(); - + this.autocontinue = payload.getUnsignedByte(); - + this.mission_type = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_mission_item(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_mission_item() { msgid = MAVLINK_MSG_ID_MISSION_ITEM; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_mission_item(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_mission_item(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MISSION_ITEM; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MISSION_ITEM - sysid:"+sysid+" compid:"+compid+" param1:"+param1+" param2:"+param2+" param3:"+param3+" param4:"+param4+" x:"+x+" y:"+y+" z:"+z+" seq:"+seq+" command:"+command+" target_system:"+target_system+" target_component:"+target_component+" frame:"+frame+" current:"+current+" autocontinue:"+autocontinue+" mission_type:"+mission_type+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MISSION_ITEM - sysid:" + sysid + " compid:" + compid + " param1:" + param1 + " param2:" + param2 + " param3:" + param3 + " param4:" + param4 + " x:" + x + " y:" + y + " z:" + z + " seq:" + seq + " command:" + command + " target_system:" + target_system + " target_component:" + target_component + " frame:" + frame + " current:" + current + " autocontinue:" + autocontinue + " mission_type:" + mission_type + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/common/msg_mission_item_int.java b/app/src/main/java/com/MAVLink/common/msg_mission_item_int.java index bd883c9..98e5601 100644 --- a/app/src/main/java/com/MAVLink/common/msg_mission_item_int.java +++ b/app/src/main/java/com/MAVLink/common/msg_mission_item_int.java @@ -6,206 +6,206 @@ // MESSAGE MISSION_ITEM_INT PACKING package com.MAVLink.common; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Message encoding a mission item. This message is emitted to announce - the presence of a mission item and to set a mission item on the system. The mission item can be either in x, y, z meters (type: LOCAL) or x:lat, y:lon, z:altitude. Local frame is Z-down, right handed (NED), global frame is Z-up, right handed (ENU). See also https://mavlink.io/en/services/mission.html. -*/ -public class msg_mission_item_int extends MAVLinkMessage{ + * Message encoding a mission item. This message is emitted to announce + * the presence of a mission item and to set a mission item on the system. The mission item can be either in x, y, z meters (type: LOCAL) or x:lat, y:lon, z:altitude. Local frame is Z-down, right handed (NED), global frame is Z-up, right handed (ENU). See also https://mavlink.io/en/services/mission.html. + */ +public class msg_mission_item_int extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MISSION_ITEM_INT = 73; public static final int MAVLINK_MSG_LENGTH = 38; private static final long serialVersionUID = MAVLINK_MSG_ID_MISSION_ITEM_INT; - /** - * PARAM1, see MAV_CMD enum - */ + * PARAM1, see MAV_CMD enum + */ public float param1; - - /** - * PARAM2, see MAV_CMD enum - */ - public float param2; - - /** - * PARAM3, see MAV_CMD enum - */ - public float param3; - - /** - * PARAM4, see MAV_CMD enum - */ - public float param4; - - /** - * PARAM5 / local: x position in meters * 1e4, global: latitude in degrees * 10^7 - */ - public int x; - - /** - * PARAM6 / y position: local: x position in meters * 1e4, global: longitude in degrees *10^7 - */ - public int y; - - /** - * PARAM7 / z position: global: altitude in meters (relative or absolute, depending on frame. - */ - public float z; - - /** - * Waypoint ID (sequence number). Starts at zero. Increases monotonically for each waypoint, no gaps in the sequence (0,1,2,3,4). - */ - public int seq; - - /** - * The scheduled action for the waypoint. - */ - public int command; - - /** - * System ID - */ - public short target_system; - - /** - * Component ID - */ - public short target_component; - - /** - * The coordinate system of the waypoint. - */ - public short frame; - - /** - * false:0, true:1 - */ - public short current; - - /** - * Autocontinue to next waypoint - */ - public short autocontinue; - - /** - * Mission type. - */ - public short mission_type; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * PARAM2, see MAV_CMD enum + */ + public float param2; + + /** + * PARAM3, see MAV_CMD enum + */ + public float param3; + + /** + * PARAM4, see MAV_CMD enum + */ + public float param4; + + /** + * PARAM5 / local: x position in meters * 1e4, global: latitude in degrees * 10^7 + */ + public int x; + + /** + * PARAM6 / y position: local: x position in meters * 1e4, global: longitude in degrees *10^7 + */ + public int y; + + /** + * PARAM7 / z position: global: altitude in meters (relative or absolute, depending on frame. + */ + public float z; + + /** + * Waypoint ID (sequence number). Starts at zero. Increases monotonically for each waypoint, no gaps in the sequence (0,1,2,3,4). + */ + public int seq; + + /** + * The scheduled action for the waypoint. + */ + public int command; + + /** + * System ID + */ + public short target_system; + + /** + * Component ID + */ + public short target_component; + + /** + * The coordinate system of the waypoint. + */ + public short frame; + + /** + * false:0, true:1 + */ + public short current; + + /** + * Autocontinue to next waypoint + */ + public short autocontinue; + + /** + * Mission type. + */ + public short mission_type; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MISSION_ITEM_INT; - + packet.payload.putFloat(param1); - + packet.payload.putFloat(param2); - + packet.payload.putFloat(param3); - + packet.payload.putFloat(param4); - + packet.payload.putInt(x); - + packet.payload.putInt(y); - + packet.payload.putFloat(z); - + packet.payload.putUnsignedShort(seq); - + packet.payload.putUnsignedShort(command); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + packet.payload.putUnsignedByte(frame); - + packet.payload.putUnsignedByte(current); - + packet.payload.putUnsignedByte(autocontinue); - + packet.payload.putUnsignedByte(mission_type); - + return packet; } /** - * Decode a mission_item_int message into this class fields - * - * @param payload The message to decode - */ + * Decode a mission_item_int message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.param1 = payload.getFloat(); - + this.param2 = payload.getFloat(); - + this.param3 = payload.getFloat(); - + this.param4 = payload.getFloat(); - + this.x = payload.getInt(); - + this.y = payload.getInt(); - + this.z = payload.getFloat(); - + this.seq = payload.getUnsignedShort(); - + this.command = payload.getUnsignedShort(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + this.frame = payload.getUnsignedByte(); - + this.current = payload.getUnsignedByte(); - + this.autocontinue = payload.getUnsignedByte(); - + this.mission_type = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_mission_item_int(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_mission_item_int() { msgid = MAVLINK_MSG_ID_MISSION_ITEM_INT; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_mission_item_int(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_mission_item_int(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MISSION_ITEM_INT; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MISSION_ITEM_INT - sysid:"+sysid+" compid:"+compid+" param1:"+param1+" param2:"+param2+" param3:"+param3+" param4:"+param4+" x:"+x+" y:"+y+" z:"+z+" seq:"+seq+" command:"+command+" target_system:"+target_system+" target_component:"+target_component+" frame:"+frame+" current:"+current+" autocontinue:"+autocontinue+" mission_type:"+mission_type+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MISSION_ITEM_INT - sysid:" + sysid + " compid:" + compid + " param1:" + param1 + " param2:" + param2 + " param3:" + param3 + " param4:" + param4 + " x:" + x + " y:" + y + " z:" + z + " seq:" + seq + " command:" + command + " target_system:" + target_system + " target_component:" + target_component + " frame:" + frame + " current:" + current + " autocontinue:" + autocontinue + " mission_type:" + mission_type + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/common/msg_mission_item_reached.java b/app/src/main/java/com/MAVLink/common/msg_mission_item_reached.java index 7392d48..54b9090 100644 --- a/app/src/main/java/com/MAVLink/common/msg_mission_item_reached.java +++ b/app/src/main/java/com/MAVLink/common/msg_mission_item_reached.java @@ -6,79 +6,79 @@ // MESSAGE MISSION_ITEM_REACHED PACKING package com.MAVLink.common; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* A certain mission item has been reached. The system will either hold this position (or circle on the orbit) or (if the autocontinue on the WP was set) continue to the next waypoint. -*/ -public class msg_mission_item_reached extends MAVLinkMessage{ + * A certain mission item has been reached. The system will either hold this position (or circle on the orbit) or (if the autocontinue on the WP was set) continue to the next waypoint. + */ +public class msg_mission_item_reached extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MISSION_ITEM_REACHED = 46; public static final int MAVLINK_MSG_LENGTH = 2; private static final long serialVersionUID = MAVLINK_MSG_ID_MISSION_ITEM_REACHED; - /** - * Sequence - */ + * Sequence + */ public int seq; - + /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MISSION_ITEM_REACHED; - + packet.payload.putUnsignedShort(seq); - + return packet; } /** - * Decode a mission_item_reached message into this class fields - * - * @param payload The message to decode - */ + * Decode a mission_item_reached message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.seq = payload.getUnsignedShort(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_mission_item_reached(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_mission_item_reached() { msgid = MAVLINK_MSG_ID_MISSION_ITEM_REACHED; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_mission_item_reached(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_mission_item_reached(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MISSION_ITEM_REACHED; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MISSION_ITEM_REACHED - sysid:"+sysid+" compid:"+compid+" seq:"+seq+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MISSION_ITEM_REACHED - sysid:" + sysid + " compid:" + compid + " seq:" + seq + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/common/msg_mission_request.java b/app/src/main/java/com/MAVLink/common/msg_mission_request.java index e97a608..b15b2f5 100644 --- a/app/src/main/java/com/MAVLink/common/msg_mission_request.java +++ b/app/src/main/java/com/MAVLink/common/msg_mission_request.java @@ -6,106 +6,106 @@ // MESSAGE MISSION_REQUEST PACKING package com.MAVLink.common; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Request the information of the mission item with the sequence number seq. The response of the system to this message should be a MISSION_ITEM message. https://mavlink.io/en/services/mission.html -*/ -public class msg_mission_request extends MAVLinkMessage{ + * Request the information of the mission item with the sequence number seq. The response of the system to this message should be a MISSION_ITEM message. https://mavlink.io/en/services/mission.html + */ +public class msg_mission_request extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MISSION_REQUEST = 40; public static final int MAVLINK_MSG_LENGTH = 5; private static final long serialVersionUID = MAVLINK_MSG_ID_MISSION_REQUEST; - /** - * Sequence - */ + * Sequence + */ public int seq; - - /** - * System ID - */ - public short target_system; - - /** - * Component ID - */ - public short target_component; - - /** - * Mission type. - */ - public short mission_type; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * System ID + */ + public short target_system; + + /** + * Component ID + */ + public short target_component; + + /** + * Mission type. + */ + public short mission_type; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MISSION_REQUEST; - + packet.payload.putUnsignedShort(seq); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + packet.payload.putUnsignedByte(mission_type); - + return packet; } /** - * Decode a mission_request message into this class fields - * - * @param payload The message to decode - */ + * Decode a mission_request message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.seq = payload.getUnsignedShort(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + this.mission_type = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_mission_request(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_mission_request() { msgid = MAVLINK_MSG_ID_MISSION_REQUEST; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_mission_request(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_mission_request(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MISSION_REQUEST; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MISSION_REQUEST - sysid:"+sysid+" compid:"+compid+" seq:"+seq+" target_system:"+target_system+" target_component:"+target_component+" mission_type:"+mission_type+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MISSION_REQUEST - sysid:" + sysid + " compid:" + compid + " seq:" + seq + " target_system:" + target_system + " target_component:" + target_component + " mission_type:" + mission_type + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/common/msg_mission_request_int.java b/app/src/main/java/com/MAVLink/common/msg_mission_request_int.java index 580e4f3..2cc0a7b 100644 --- a/app/src/main/java/com/MAVLink/common/msg_mission_request_int.java +++ b/app/src/main/java/com/MAVLink/common/msg_mission_request_int.java @@ -6,106 +6,106 @@ // MESSAGE MISSION_REQUEST_INT PACKING package com.MAVLink.common; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Request the information of the mission item with the sequence number seq. The response of the system to this message should be a MISSION_ITEM_INT message. https://mavlink.io/en/services/mission.html -*/ -public class msg_mission_request_int extends MAVLinkMessage{ + * Request the information of the mission item with the sequence number seq. The response of the system to this message should be a MISSION_ITEM_INT message. https://mavlink.io/en/services/mission.html + */ +public class msg_mission_request_int extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MISSION_REQUEST_INT = 51; public static final int MAVLINK_MSG_LENGTH = 5; private static final long serialVersionUID = MAVLINK_MSG_ID_MISSION_REQUEST_INT; - /** - * Sequence - */ + * Sequence + */ public int seq; - - /** - * System ID - */ - public short target_system; - - /** - * Component ID - */ - public short target_component; - - /** - * Mission type. - */ - public short mission_type; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * System ID + */ + public short target_system; + + /** + * Component ID + */ + public short target_component; + + /** + * Mission type. + */ + public short mission_type; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MISSION_REQUEST_INT; - + packet.payload.putUnsignedShort(seq); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + packet.payload.putUnsignedByte(mission_type); - + return packet; } /** - * Decode a mission_request_int message into this class fields - * - * @param payload The message to decode - */ + * Decode a mission_request_int message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.seq = payload.getUnsignedShort(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + this.mission_type = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_mission_request_int(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_mission_request_int() { msgid = MAVLINK_MSG_ID_MISSION_REQUEST_INT; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_mission_request_int(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_mission_request_int(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MISSION_REQUEST_INT; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MISSION_REQUEST_INT - sysid:"+sysid+" compid:"+compid+" seq:"+seq+" target_system:"+target_system+" target_component:"+target_component+" mission_type:"+mission_type+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MISSION_REQUEST_INT - sysid:" + sysid + " compid:" + compid + " seq:" + seq + " target_system:" + target_system + " target_component:" + target_component + " mission_type:" + mission_type + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/common/msg_mission_request_list.java b/app/src/main/java/com/MAVLink/common/msg_mission_request_list.java index 74b2722..d7ea56b 100644 --- a/app/src/main/java/com/MAVLink/common/msg_mission_request_list.java +++ b/app/src/main/java/com/MAVLink/common/msg_mission_request_list.java @@ -6,97 +6,97 @@ // MESSAGE MISSION_REQUEST_LIST PACKING package com.MAVLink.common; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Request the overall list of mission items from the system/component. -*/ -public class msg_mission_request_list extends MAVLinkMessage{ + * Request the overall list of mission items from the system/component. + */ +public class msg_mission_request_list extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MISSION_REQUEST_LIST = 43; public static final int MAVLINK_MSG_LENGTH = 3; private static final long serialVersionUID = MAVLINK_MSG_ID_MISSION_REQUEST_LIST; - /** - * System ID - */ + * System ID + */ public short target_system; - - /** - * Component ID - */ - public short target_component; - - /** - * Mission type. - */ - public short mission_type; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Component ID + */ + public short target_component; + + /** + * Mission type. + */ + public short mission_type; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MISSION_REQUEST_LIST; - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + packet.payload.putUnsignedByte(mission_type); - + return packet; } /** - * Decode a mission_request_list message into this class fields - * - * @param payload The message to decode - */ + * Decode a mission_request_list message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + this.mission_type = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_mission_request_list(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_mission_request_list() { msgid = MAVLINK_MSG_ID_MISSION_REQUEST_LIST; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_mission_request_list(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_mission_request_list(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MISSION_REQUEST_LIST; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MISSION_REQUEST_LIST - sysid:"+sysid+" compid:"+compid+" target_system:"+target_system+" target_component:"+target_component+" mission_type:"+mission_type+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MISSION_REQUEST_LIST - sysid:" + sysid + " compid:" + compid + " target_system:" + target_system + " target_component:" + target_component + " mission_type:" + mission_type + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/common/msg_mission_request_partial_list.java b/app/src/main/java/com/MAVLink/common/msg_mission_request_partial_list.java index ec915e8..abc2167 100644 --- a/app/src/main/java/com/MAVLink/common/msg_mission_request_partial_list.java +++ b/app/src/main/java/com/MAVLink/common/msg_mission_request_partial_list.java @@ -6,115 +6,115 @@ // MESSAGE MISSION_REQUEST_PARTIAL_LIST PACKING package com.MAVLink.common; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Request a partial list of mission items from the system/component. https://mavlink.io/en/services/mission.html. If start and end index are the same, just send one waypoint. -*/ -public class msg_mission_request_partial_list extends MAVLinkMessage{ + * Request a partial list of mission items from the system/component. https://mavlink.io/en/services/mission.html. If start and end index are the same, just send one waypoint. + */ +public class msg_mission_request_partial_list extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MISSION_REQUEST_PARTIAL_LIST = 37; public static final int MAVLINK_MSG_LENGTH = 7; private static final long serialVersionUID = MAVLINK_MSG_ID_MISSION_REQUEST_PARTIAL_LIST; - /** - * Start index - */ + * Start index + */ public short start_index; - - /** - * End index, -1 by default (-1: send list to end). Else a valid index of the list - */ - public short end_index; - - /** - * System ID - */ - public short target_system; - - /** - * Component ID - */ - public short target_component; - - /** - * Mission type. - */ - public short mission_type; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * End index, -1 by default (-1: send list to end). Else a valid index of the list + */ + public short end_index; + + /** + * System ID + */ + public short target_system; + + /** + * Component ID + */ + public short target_component; + + /** + * Mission type. + */ + public short mission_type; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MISSION_REQUEST_PARTIAL_LIST; - + packet.payload.putShort(start_index); - + packet.payload.putShort(end_index); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + packet.payload.putUnsignedByte(mission_type); - + return packet; } /** - * Decode a mission_request_partial_list message into this class fields - * - * @param payload The message to decode - */ + * Decode a mission_request_partial_list message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.start_index = payload.getShort(); - + this.end_index = payload.getShort(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + this.mission_type = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_mission_request_partial_list(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_mission_request_partial_list() { msgid = MAVLINK_MSG_ID_MISSION_REQUEST_PARTIAL_LIST; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_mission_request_partial_list(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_mission_request_partial_list(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MISSION_REQUEST_PARTIAL_LIST; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MISSION_REQUEST_PARTIAL_LIST - sysid:"+sysid+" compid:"+compid+" start_index:"+start_index+" end_index:"+end_index+" target_system:"+target_system+" target_component:"+target_component+" mission_type:"+mission_type+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MISSION_REQUEST_PARTIAL_LIST - sysid:" + sysid + " compid:" + compid + " start_index:" + start_index + " end_index:" + end_index + " target_system:" + target_system + " target_component:" + target_component + " mission_type:" + mission_type + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/common/msg_mission_set_current.java b/app/src/main/java/com/MAVLink/common/msg_mission_set_current.java index d1e88b4..5f98526 100644 --- a/app/src/main/java/com/MAVLink/common/msg_mission_set_current.java +++ b/app/src/main/java/com/MAVLink/common/msg_mission_set_current.java @@ -6,97 +6,97 @@ // MESSAGE MISSION_SET_CURRENT PACKING package com.MAVLink.common; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Set the mission item with sequence number seq as current item. This means that the MAV will continue to this mission item on the shortest path (not following the mission items in-between). -*/ -public class msg_mission_set_current extends MAVLinkMessage{ + * Set the mission item with sequence number seq as current item. This means that the MAV will continue to this mission item on the shortest path (not following the mission items in-between). + */ +public class msg_mission_set_current extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MISSION_SET_CURRENT = 41; public static final int MAVLINK_MSG_LENGTH = 4; private static final long serialVersionUID = MAVLINK_MSG_ID_MISSION_SET_CURRENT; - /** - * Sequence - */ + * Sequence + */ public int seq; - - /** - * System ID - */ - public short target_system; - - /** - * Component ID - */ - public short target_component; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * System ID + */ + public short target_system; + + /** + * Component ID + */ + public short target_component; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MISSION_SET_CURRENT; - + packet.payload.putUnsignedShort(seq); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + return packet; } /** - * Decode a mission_set_current message into this class fields - * - * @param payload The message to decode - */ + * Decode a mission_set_current message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.seq = payload.getUnsignedShort(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_mission_set_current(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_mission_set_current() { msgid = MAVLINK_MSG_ID_MISSION_SET_CURRENT; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_mission_set_current(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_mission_set_current(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MISSION_SET_CURRENT; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MISSION_SET_CURRENT - sysid:"+sysid+" compid:"+compid+" seq:"+seq+" target_system:"+target_system+" target_component:"+target_component+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MISSION_SET_CURRENT - sysid:" + sysid + " compid:" + compid + " seq:" + seq + " target_system:" + target_system + " target_component:" + target_component + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/common/msg_mission_write_partial_list.java b/app/src/main/java/com/MAVLink/common/msg_mission_write_partial_list.java index 041c6b5..cd868f6 100644 --- a/app/src/main/java/com/MAVLink/common/msg_mission_write_partial_list.java +++ b/app/src/main/java/com/MAVLink/common/msg_mission_write_partial_list.java @@ -6,115 +6,115 @@ // MESSAGE MISSION_WRITE_PARTIAL_LIST PACKING package com.MAVLink.common; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* This message is sent to the MAV to write a partial list. If start index == end index, only one item will be transmitted / updated. If the start index is NOT 0 and above the current list size, this request should be REJECTED! -*/ -public class msg_mission_write_partial_list extends MAVLinkMessage{ + * This message is sent to the MAV to write a partial list. If start index == end index, only one item will be transmitted / updated. If the start index is NOT 0 and above the current list size, this request should be REJECTED! + */ +public class msg_mission_write_partial_list extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MISSION_WRITE_PARTIAL_LIST = 38; public static final int MAVLINK_MSG_LENGTH = 7; private static final long serialVersionUID = MAVLINK_MSG_ID_MISSION_WRITE_PARTIAL_LIST; - /** - * Start index. Must be smaller / equal to the largest index of the current onboard list. - */ + * Start index. Must be smaller / equal to the largest index of the current onboard list. + */ public short start_index; - - /** - * End index, equal or greater than start index. - */ - public short end_index; - - /** - * System ID - */ - public short target_system; - - /** - * Component ID - */ - public short target_component; - - /** - * Mission type. - */ - public short mission_type; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * End index, equal or greater than start index. + */ + public short end_index; + + /** + * System ID + */ + public short target_system; + + /** + * Component ID + */ + public short target_component; + + /** + * Mission type. + */ + public short mission_type; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MISSION_WRITE_PARTIAL_LIST; - + packet.payload.putShort(start_index); - + packet.payload.putShort(end_index); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - + packet.payload.putUnsignedByte(mission_type); - + return packet; } /** - * Decode a mission_write_partial_list message into this class fields - * - * @param payload The message to decode - */ + * Decode a mission_write_partial_list message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.start_index = payload.getShort(); - + this.end_index = payload.getShort(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - + this.mission_type = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_mission_write_partial_list(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_mission_write_partial_list() { msgid = MAVLINK_MSG_ID_MISSION_WRITE_PARTIAL_LIST; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_mission_write_partial_list(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_mission_write_partial_list(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MISSION_WRITE_PARTIAL_LIST; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MISSION_WRITE_PARTIAL_LIST - sysid:"+sysid+" compid:"+compid+" start_index:"+start_index+" end_index:"+end_index+" target_system:"+target_system+" target_component:"+target_component+" mission_type:"+mission_type+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MISSION_WRITE_PARTIAL_LIST - sysid:" + sysid + " compid:" + compid + " start_index:" + start_index + " end_index:" + end_index + " target_system:" + target_system + " target_component:" + target_component + " mission_type:" + mission_type + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/common/msg_mount_orientation.java b/app/src/main/java/com/MAVLink/common/msg_mount_orientation.java index feb1848..42ab3f8 100644 --- a/app/src/main/java/com/MAVLink/common/msg_mount_orientation.java +++ b/app/src/main/java/com/MAVLink/common/msg_mount_orientation.java @@ -6,115 +6,115 @@ // MESSAGE MOUNT_ORIENTATION PACKING package com.MAVLink.common; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Orientation of a mount -*/ -public class msg_mount_orientation extends MAVLinkMessage{ + * Orientation of a mount + */ +public class msg_mount_orientation extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_MOUNT_ORIENTATION = 265; public static final int MAVLINK_MSG_LENGTH = 20; private static final long serialVersionUID = MAVLINK_MSG_ID_MOUNT_ORIENTATION; - /** - * Timestamp (time since system boot). - */ + * Timestamp (time since system boot). + */ public long time_boot_ms; - - /** - * Roll in global frame (set to NaN for invalid). - */ - public float roll; - - /** - * Pitch in global frame (set to NaN for invalid). - */ - public float pitch; - - /** - * Yaw relative to vehicle (set to NaN for invalid). - */ - public float yaw; - - /** - * Yaw in absolute frame relative to Earth's North, north is 0 (set to NaN for invalid). - */ - public float yaw_absolute; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Roll in global frame (set to NaN for invalid). + */ + public float roll; + + /** + * Pitch in global frame (set to NaN for invalid). + */ + public float pitch; + + /** + * Yaw relative to vehicle (set to NaN for invalid). + */ + public float yaw; + + /** + * Yaw in absolute frame relative to Earth's North, north is 0 (set to NaN for invalid). + */ + public float yaw_absolute; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_MOUNT_ORIENTATION; - + packet.payload.putUnsignedInt(time_boot_ms); - + packet.payload.putFloat(roll); - + packet.payload.putFloat(pitch); - + packet.payload.putFloat(yaw); - + packet.payload.putFloat(yaw_absolute); - + return packet; } /** - * Decode a mount_orientation message into this class fields - * - * @param payload The message to decode - */ + * Decode a mount_orientation message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.time_boot_ms = payload.getUnsignedInt(); - + this.roll = payload.getFloat(); - + this.pitch = payload.getFloat(); - + this.yaw = payload.getFloat(); - + this.yaw_absolute = payload.getFloat(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_mount_orientation(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_mount_orientation() { msgid = MAVLINK_MSG_ID_MOUNT_ORIENTATION; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_mount_orientation(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_mount_orientation(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_MOUNT_ORIENTATION; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_MOUNT_ORIENTATION - sysid:"+sysid+" compid:"+compid+" time_boot_ms:"+time_boot_ms+" roll:"+roll+" pitch:"+pitch+" yaw:"+yaw+" yaw_absolute:"+yaw_absolute+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_MOUNT_ORIENTATION - sysid:" + sysid + " compid:" + compid + " time_boot_ms:" + time_boot_ms + " roll:" + roll + " pitch:" + pitch + " yaw:" + yaw + " yaw_absolute:" + yaw_absolute + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/common/msg_named_value_float.java b/app/src/main/java/com/MAVLink/common/msg_named_value_float.java index a4ef351..525b772 100644 --- a/app/src/main/java/com/MAVLink/common/msg_named_value_float.java +++ b/app/src/main/java/com/MAVLink/common/msg_named_value_float.java @@ -6,117 +6,117 @@ // MESSAGE NAMED_VALUE_FLOAT PACKING package com.MAVLink.common; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Send a key-value pair as float. The use of this message is discouraged for normal packets, but a quite efficient way for testing new messages and getting experimental debug output. -*/ -public class msg_named_value_float extends MAVLinkMessage{ + * Send a key-value pair as float. The use of this message is discouraged for normal packets, but a quite efficient way for testing new messages and getting experimental debug output. + */ +public class msg_named_value_float extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_NAMED_VALUE_FLOAT = 251; public static final int MAVLINK_MSG_LENGTH = 18; private static final long serialVersionUID = MAVLINK_MSG_ID_NAMED_VALUE_FLOAT; - /** - * Timestamp (time since system boot). - */ + * Timestamp (time since system boot). + */ public long time_boot_ms; - - /** - * Floating point value - */ - public float value; - - /** - * Name of the debug variable - */ - public byte name[] = new byte[10]; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Floating point value + */ + public float value; + + /** + * Name of the debug variable + */ + public byte name[] = new byte[10]; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_NAMED_VALUE_FLOAT; - + packet.payload.putUnsignedInt(time_boot_ms); - + packet.payload.putFloat(value); - - + + for (int i = 0; i < name.length; i++) { packet.payload.putByte(name[i]); } - - + + return packet; } /** - * Decode a named_value_float message into this class fields - * - * @param payload The message to decode - */ + * Decode a named_value_float message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.time_boot_ms = payload.getUnsignedInt(); - + this.value = payload.getFloat(); - - + + for (int i = 0; i < this.name.length; i++) { this.name[i] = payload.getByte(); } - - + + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_named_value_float(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_named_value_float() { msgid = MAVLINK_MSG_ID_NAMED_VALUE_FLOAT; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_named_value_float(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_named_value_float(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_NAMED_VALUE_FLOAT; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Sets the buffer of this message with a string, adds the necessary padding - */ + * Sets the buffer of this message with a string, adds the necessary padding + */ public void setName(String str) { int len = Math.min(str.length(), 10); - for (int i=0; i value[float]. This allows to send a parameter to any other component (such as the GCS) without the need of previous knowledge of possible parameter names. Thus the same GCS can store different parameters for different autopilots. See also https://mavlink.io/en/services/parameter.html for a full documentation of QGroundControl and IMU code. -*/ -public class msg_param_request_read extends MAVLinkMessage{ + * Request to read the onboard parameter with the param_id string id. Onboard parameters are stored as key[const char*] -> value[float]. This allows to send a parameter to any other component (such as the GCS) without the need of previous knowledge of possible parameter names. Thus the same GCS can store different parameters for different autopilots. See also https://mavlink.io/en/services/parameter.html for a full documentation of QGroundControl and IMU code. + */ +public class msg_param_request_read extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_PARAM_REQUEST_READ = 20; public static final int MAVLINK_MSG_LENGTH = 20; private static final long serialVersionUID = MAVLINK_MSG_ID_PARAM_REQUEST_READ; - /** - * Parameter index. Send -1 to use the param ID field as identifier (else the param id will be ignored) - */ + * Parameter index. Send -1 to use the param ID field as identifier (else the param id will be ignored) + */ public short param_index; - - /** - * System ID - */ - public short target_system; - - /** - * Component ID - */ - public short target_component; - - /** - * Onboard parameter id, terminated by NULL if the length is less than 16 human-readable chars and WITHOUT null termination (NULL) byte if the length is exactly 16 chars - applications have to provide 16+1 bytes storage if the ID is stored as string - */ - public byte param_id[] = new byte[16]; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * System ID + */ + public short target_system; + + /** + * Component ID + */ + public short target_component; + + /** + * Onboard parameter id, terminated by NULL if the length is less than 16 human-readable chars and WITHOUT null termination (NULL) byte if the length is exactly 16 chars - applications have to provide 16+1 bytes storage if the ID is stored as string + */ + public byte param_id[] = new byte[16]; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_PARAM_REQUEST_READ; - + packet.payload.putShort(param_index); - + packet.payload.putUnsignedByte(target_system); - + packet.payload.putUnsignedByte(target_component); - - + + for (int i = 0; i < param_id.length; i++) { packet.payload.putByte(param_id[i]); } - - + + return packet; } /** - * Decode a param_request_read message into this class fields - * - * @param payload The message to decode - */ + * Decode a param_request_read message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.param_index = payload.getShort(); - + this.target_system = payload.getUnsignedByte(); - + this.target_component = payload.getUnsignedByte(); - - + + for (int i = 0; i < this.param_id.length; i++) { this.param_id[i] = payload.getByte(); } - - + + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_param_request_read(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_param_request_read() { msgid = MAVLINK_MSG_ID_PARAM_REQUEST_READ; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_param_request_read(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_param_request_read(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_PARAM_REQUEST_READ; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Sets the buffer of this message with a string, adds the necessary padding - */ + * Sets the buffer of this message with a string, adds the necessary padding + */ public void setParam_Id(String str) { int len = Math.min(str.length(), 16); - for (int i=0; i 0 radius to pass by WP. Positive value for clockwise orbit, negative value for counter-clockwise orbit. Allows trajectory control.| Desired yaw angle at waypoint (rotary wing). NaN to use the current system yaw heading mode (e.g. yaw towards next waypoint, yaw to home, etc.).| Latitude| Longitude| Altitude| */ - public static final int MAV_CMD_NAV_LOITER_UNLIM = 17; /* Loiter around this waypoint an unlimited amount of time |Empty| Empty| Radius around waypoint. If positive loiter clockwise, else counter-clockwise| Desired yaw angle. NaN to use the current system yaw heading mode (e.g. yaw towards next waypoint, yaw to home, etc.).| Latitude| Longitude| Altitude| */ - public static final int MAV_CMD_NAV_LOITER_TURNS = 18; /* Loiter around this waypoint for X turns |Number of turns.| Empty| Radius around waypoint. If positive loiter clockwise, else counter-clockwise| Forward moving aircraft this sets exit xtrack location: 0 for center of loiter wp, 1 for exit location. Else, this is desired yaw angle. NaN to use the current system yaw heading mode (e.g. yaw towards next waypoint, yaw to home, etc.).| Latitude| Longitude| Altitude| */ - public static final int MAV_CMD_NAV_LOITER_TIME = 19; /* Loiter around this waypoint for X seconds |Loiter time.| Empty| Radius around waypoint. If positive loiter clockwise, else counter-clockwise.| Forward moving aircraft this sets exit xtrack location: 0 for center of loiter wp, 1 for exit location. Else, this is desired yaw angle. NaN to use the current system yaw heading mode (e.g. yaw towards next waypoint, yaw to home, etc.).| Latitude| Longitude| Altitude| */ - public static final int MAV_CMD_NAV_RETURN_TO_LAUNCH = 20; /* Return to launch location |Empty| Empty| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_NAV_LAND = 21; /* Land at location. |Minimum target altitude if landing is aborted (0 = undefined/use system default).| Precision land mode.| Empty.| Desired yaw angle. NaN to use the current system yaw heading mode (e.g. yaw towards next waypoint, yaw to home, etc.).| Latitude.| Longitude.| Landing altitude (ground level in current frame).| */ - public static final int MAV_CMD_NAV_TAKEOFF = 22; /* Takeoff from ground / hand |Minimum pitch (if airspeed sensor present), desired pitch without sensor| Empty| Empty| Yaw angle (if magnetometer present), ignored without magnetometer. NaN to use the current system yaw heading mode (e.g. yaw towards next waypoint, yaw to home, etc.).| Latitude| Longitude| Altitude| */ - public static final int MAV_CMD_NAV_LAND_LOCAL = 23; /* Land at local position (local frame only) |Landing target number (if available)| Maximum accepted offset from desired landing position - computed magnitude from spherical coordinates: d = sqrt(x^2 + y^2 + z^2), which gives the maximum accepted distance between the desired landing position and the position where the vehicle is about to land| Landing descend rate| Desired yaw angle| Y-axis position| X-axis position| Z-axis / ground level position| */ - public static final int MAV_CMD_NAV_TAKEOFF_LOCAL = 24; /* Takeoff from local position (local frame only) |Minimum pitch (if airspeed sensor present), desired pitch without sensor| Empty| Takeoff ascend rate| Yaw angle (if magnetometer or another yaw estimation source present), ignored without one of these| Y-axis position| X-axis position| Z-axis position| */ - public static final int MAV_CMD_NAV_FOLLOW = 25; /* Vehicle following, i.e. this waypoint represents the position of a moving vehicle |Following logic to use (e.g. loitering or sinusoidal following) - depends on specific autopilot implementation| Ground speed of vehicle to be followed| Radius around waypoint. If positive loiter clockwise, else counter-clockwise| Desired yaw angle.| Latitude| Longitude| Altitude| */ - public static final int MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT = 30; /* Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command (i.e., don't proceed to the next command until the desired altitude is reached. |Climb or Descend (0 = Neutral, command completes when within 5m of this command's altitude, 1 = Climbing, command completes when at or above this command's altitude, 2 = Descending, command completes when at or below this command's altitude.| Empty| Empty| Empty| Empty| Empty| Desired altitude| */ - public static final int MAV_CMD_NAV_LOITER_TO_ALT = 31; /* Begin loiter at the specified Latitude and Longitude. If Lat=Lon=0, then loiter at the current position. Don't consider the navigation command complete (don't leave loiter) until the altitude has been reached. Additionally, if the Heading Required parameter is non-zero the aircraft will not leave the loiter until heading toward the next waypoint. |Heading Required (0 = False)| Radius. If positive loiter clockwise, negative counter-clockwise, 0 means no change to standard loiter.| Empty| Forward moving aircraft this sets exit xtrack location: 0 for center of loiter wp, 1 for exit location| Latitude| Longitude| Altitude| */ - public static final int MAV_CMD_DO_FOLLOW = 32; /* Begin following a target |System ID (of the FOLLOW_TARGET beacon). Send 0 to disable follow-me and return to the default position hold mode.| RESERVED| RESERVED| Altitude mode: 0: Keep current altitude, 1: keep altitude difference to target, 2: go to a fixed altitude above home.| Altitude above home. (used if mode=2)| RESERVED| Time to land in which the MAV should go to the default position hold mode after a message RX timeout.| */ - public static final int MAV_CMD_DO_FOLLOW_REPOSITION = 33; /* Reposition the MAV after a follow target command has been sent |Camera q1 (where 0 is on the ray from the camera to the tracking device)| Camera q2| Camera q3| Camera q4| altitude offset from target| X offset from target| Y offset from target| */ - public static final int MAV_CMD_DO_ORBIT = 34; /* Start orbiting on the circumference of a circle defined by the parameters. Setting any value NaN results in using defaults. |Radius of the circle. positive: Orbit clockwise. negative: Orbit counter-clockwise.| Tangential Velocity. NaN: Vehicle configuration default.| Yaw behavior of the vehicle.| Reserved (e.g. for dynamic center beacon options)| Center point latitude (if no MAV_FRAME specified) / X coordinate according to MAV_FRAME. NaN: Use current vehicle position or current center if already orbiting.| Center point longitude (if no MAV_FRAME specified) / Y coordinate according to MAV_FRAME. NaN: Use current vehicle position or current center if already orbiting.| Center point altitude (MSL) (if no MAV_FRAME specified) / Z coordinate according to MAV_FRAME. NaN: Use current vehicle position or current center if already orbiting.| */ - public static final int MAV_CMD_NAV_ROI = 80; /* Sets the region of interest (ROI) for a sensor set or the vehicle itself. This can then be used by the vehicles control system to control the vehicle attitude and the attitude of various sensors such as cameras. |Region of interest mode.| Waypoint index/ target ID. (see MAV_ROI enum)| ROI index (allows a vehicle to manage multiple ROI's)| Empty| x the location of the fixed ROI (see MAV_FRAME)| y| z| */ - public static final int MAV_CMD_NAV_PATHPLANNING = 81; /* Control autonomous path planning on the MAV. |0: Disable local obstacle avoidance / local path planning (without resetting map), 1: Enable local path planning, 2: Enable and reset local path planning| 0: Disable full path planning (without resetting map), 1: Enable, 2: Enable and reset map/occupancy grid, 3: Enable and reset planned route, but not occupancy grid| Empty| Yaw angle at goal| Latitude/X of goal| Longitude/Y of goal| Altitude/Z of goal| */ - public static final int MAV_CMD_NAV_SPLINE_WAYPOINT = 82; /* Navigate to waypoint using a spline path. |Hold time. (ignored by fixed wing, time to stay at waypoint for rotary wing)| Empty| Empty| Empty| Latitude/X of goal| Longitude/Y of goal| Altitude/Z of goal| */ - public static final int MAV_CMD_NAV_ALTITUDE_WAIT = 83; /* Mission command to wait for an altitude or downwards vertical speed. This is meant for high altitude balloon launches, allowing the aircraft to be idle until either an altitude is reached or a negative vertical speed is reached (indicating early balloon burst). The wiggle time is how often to wiggle the control surfaces to prevent them seizing up. |Altitude (m).| Descent speed (m/s).| Wiggle Time (s).| Empty.| Empty.| Empty.| Empty.| */ - public static final int MAV_CMD_NAV_VTOL_TAKEOFF = 84; /* Takeoff from ground using VTOL mode, and transition to forward flight with specified heading. |Empty| Front transition heading.| Empty| Yaw angle. NaN to use the current system yaw heading mode (e.g. yaw towards next waypoint, yaw to home, etc.).| Latitude| Longitude| Altitude| */ - public static final int MAV_CMD_NAV_VTOL_LAND = 85; /* Land using VTOL mode |Empty| Empty| Approach altitude (with the same reference as the Altitude field). NaN if unspecified.| Yaw angle. NaN to use the current system yaw heading mode (e.g. yaw towards next waypoint, yaw to home, etc.).| Latitude| Longitude| Altitude (ground level)| */ - public static final int MAV_CMD_NAV_GUIDED_ENABLE = 92; /* hand control over to an external controller |On / Off (> 0.5f on)| Empty| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_NAV_DELAY = 93; /* Delay the next navigation command a number of seconds or until a specified time |Delay (-1 to enable time-of-day fields)| hour (24h format, UTC, -1 to ignore)| minute (24h format, UTC, -1 to ignore)| second (24h format, UTC)| Empty| Empty| Empty| */ - public static final int MAV_CMD_NAV_PAYLOAD_PLACE = 94; /* Descend and place payload. Vehicle moves to specified location, descends until it detects a hanging payload has reached the ground, and then releases the payload. If ground is not detected before the reaching the maximum descent value (param1), the command will complete without releasing the payload. |Maximum distance to descend.| Empty| Empty| Empty| Latitude| Longitude| Altitude| */ - public static final int MAV_CMD_NAV_LAST = 95; /* NOP - This command is only used to mark the upper limit of the NAV/ACTION commands in the enumeration |Empty| Empty| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_CONDITION_DELAY = 112; /* Delay mission state machine. |Delay| Empty| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_CONDITION_CHANGE_ALT = 113; /* Ascend/descend at rate. Delay mission state machine until desired altitude reached. |Descent / Ascend rate.| Empty| Empty| Empty| Empty| Empty| Finish Altitude| */ - public static final int MAV_CMD_CONDITION_DISTANCE = 114; /* Delay mission state machine until within desired distance of next NAV point. |Distance.| Empty| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_CONDITION_YAW = 115; /* Reach a certain target angle. |target angle, 0 is north| angular speed| direction: -1: counter clockwise, 1: clockwise| 0: absolute angle, 1: relative offset| Empty| Empty| Empty| */ - public static final int MAV_CMD_CONDITION_LAST = 159; /* NOP - This command is only used to mark the upper limit of the CONDITION commands in the enumeration |Empty| Empty| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_SET_MODE = 176; /* Set system mode. |Mode| Custom mode - this is system specific, please refer to the individual autopilot specifications for details.| Custom sub mode - this is system specific, please refer to the individual autopilot specifications for details.| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_JUMP = 177; /* Jump to the desired command in the mission list. Repeat this action only the specified number of times |Sequence number| Repeat count| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_CHANGE_SPEED = 178; /* Change speed and/or throttle set points. |Speed type (0=Airspeed, 1=Ground Speed, 2=Climb Speed, 3=Descent Speed)| Speed (-1 indicates no change)| Throttle (-1 indicates no change)| 0: absolute, 1: relative| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_SET_HOME = 179; /* Changes the home location either to the current location or a specified location. |Use current (1=use current location, 0=use specified location)| Empty| Empty| Empty| Latitude| Longitude| Altitude| */ - public static final int MAV_CMD_DO_SET_PARAMETER = 180; /* Set a system parameter. Caution! Use of this command requires knowledge of the numeric enumeration value of the parameter. |Parameter number| Parameter value| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_SET_RELAY = 181; /* Set a relay to a condition. |Relay instance number.| Setting. (1=on, 0=off, others possible depending on system hardware)| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_REPEAT_RELAY = 182; /* Cycle a relay on and off for a desired number of cycles with a desired period. |Relay instance number.| Cycle count.| Cycle time.| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_SET_SERVO = 183; /* Set a servo to a desired PWM value. |Servo instance number.| Pulse Width Modulation.| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_REPEAT_SERVO = 184; /* Cycle a between its nominal setting and a desired PWM for a desired number of cycles with a desired period. |Servo instance number.| Pulse Width Modulation.| Cycle count.| Cycle time.| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_FLIGHTTERMINATION = 185; /* Terminate flight immediately |Flight termination activated if > 0.5| Empty| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_CHANGE_ALTITUDE = 186; /* Change altitude set point. |Altitude.| Frame of new altitude.| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_LAND_START = 189; /* Mission command to perform a landing. This is used as a marker in a mission to tell the autopilot where a sequence of mission items that represents a landing starts. It may also be sent via a COMMAND_LONG to trigger a landing, in which case the nearest (geographically) landing sequence in the mission will be used. The Latitude/Longitude is optional, and may be set to 0 if not needed. If specified then it will be used to help find the closest landing sequence. |Empty| Empty| Empty| Empty| Latitude| Longitude| Empty| */ - public static final int MAV_CMD_DO_RALLY_LAND = 190; /* Mission command to perform a landing from a rally point. |Break altitude| Landing speed| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_GO_AROUND = 191; /* Mission command to safely abort an autonomous landing. |Altitude| Empty| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_REPOSITION = 192; /* Reposition the vehicle to a specific WGS84 global position. |Ground speed, less than 0 (-1) for default| Bitmask of option flags.| Reserved| Yaw heading. NaN to use the current system yaw heading mode (e.g. yaw towards next waypoint, yaw to home, etc.). For planes indicates loiter direction (0: clockwise, 1: counter clockwise)| Latitude| Longitude| Altitude (meters)| */ - public static final int MAV_CMD_DO_PAUSE_CONTINUE = 193; /* If in a GPS controlled position mode, hold the current position or continue. |0: Pause current mission or reposition command, hold current position. 1: Continue mission. A VTOL capable vehicle should enter hover mode (multicopter and VTOL planes). A plane should loiter with the default loiter radius.| Reserved| Reserved| Reserved| Reserved| Reserved| Reserved| */ - public static final int MAV_CMD_DO_SET_REVERSE = 194; /* Set moving direction to forward or reverse. |Direction (0=Forward, 1=Reverse)| Empty| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_SET_ROI_LOCATION = 195; /* Sets the region of interest (ROI) to a location. This can then be used by the vehicles control system to control the vehicle attitude and the attitude of various sensors such as cameras. |Empty| Empty| Empty| Empty| Latitude| Longitude| Altitude| */ - public static final int MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET = 196; /* Sets the region of interest (ROI) to be toward next waypoint, with optional pitch/roll/yaw offset. This can then be used by the vehicles control system to control the vehicle attitude and the attitude of various sensors such as cameras. |Empty| Empty| Empty| Empty| pitch offset from next waypoint| roll offset from next waypoint| yaw offset from next waypoint| */ - public static final int MAV_CMD_DO_SET_ROI_NONE = 197; /* Cancels any previous ROI command returning the vehicle/sensors to default flight characteristics. This can then be used by the vehicles control system to control the vehicle attitude and the attitude of various sensors such as cameras. |Empty| Empty| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_SET_ROI_SYSID = 198; /* Mount tracks system with specified system ID. Determination of target vehicle position may be done with GLOBAL_POSITION_INT or any other means. |sysid| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_DO_CONTROL_VIDEO = 200; /* Control onboard camera system. |Camera ID (-1 for all)| Transmission: 0: disabled, 1: enabled compressed, 2: enabled raw| Transmission mode: 0: video stream, >0: single images every n seconds| Recording: 0: disabled, 1: enabled compressed, 2: enabled raw| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_SET_ROI = 201; /* Sets the region of interest (ROI) for a sensor set or the vehicle itself. This can then be used by the vehicles control system to control the vehicle attitude and the attitude of various sensors such as cameras. |Region of interest mode.| Waypoint index/ target ID (depends on param 1).| Region of interest index. (allows a vehicle to manage multiple ROI's)| Empty| MAV_ROI_WPNEXT: pitch offset from next waypoint, MAV_ROI_LOCATION: latitude| MAV_ROI_WPNEXT: roll offset from next waypoint, MAV_ROI_LOCATION: longitude| MAV_ROI_WPNEXT: yaw offset from next waypoint, MAV_ROI_LOCATION: altitude| */ - public static final int MAV_CMD_DO_DIGICAM_CONFIGURE = 202; /* Configure digital camera. This is a fallback message for systems that have not yet implemented PARAM_EXT_XXX messages and camera definition files (see https://mavlink.io/en/services/camera_def.html ). |Modes: P, TV, AV, M, Etc.| Shutter speed: Divisor number for one second.| Aperture: F stop number.| ISO number e.g. 80, 100, 200, Etc.| Exposure type enumerator.| Command Identity.| Main engine cut-off time before camera trigger. (0 means no cut-off)| */ - public static final int MAV_CMD_DO_DIGICAM_CONTROL = 203; /* Control digital camera. This is a fallback message for systems that have not yet implemented PARAM_EXT_XXX messages and camera definition files (see https://mavlink.io/en/services/camera_def.html ). |Session control e.g. show/hide lens| Zoom's absolute position| Zooming step value to offset zoom from the current position| Focus Locking, Unlocking or Re-locking| Shooting Command| Command Identity| Test shot identifier. If set to 1, image will only be captured, but not counted towards internal frame count.| */ - public static final int MAV_CMD_DO_MOUNT_CONFIGURE = 204; /* Mission command to configure a camera or antenna mount |Mount operation mode| stabilize roll? (1 = yes, 0 = no)| stabilize pitch? (1 = yes, 0 = no)| stabilize yaw? (1 = yes, 0 = no)| roll input (0 = angle body frame, 1 = angular rate, 2 = angle absolute frame)| pitch input (0 = angle body frame, 1 = angular rate, 2 = angle absolute frame)| yaw input (0 = angle body frame, 1 = angular rate, 2 = angle absolute frame)| */ - public static final int MAV_CMD_DO_MOUNT_CONTROL = 205; /* Mission command to control a camera or antenna mount |pitch depending on mount mode (degrees or degrees/second depending on pitch input).| roll depending on mount mode (degrees or degrees/second depending on roll input).| yaw depending on mount mode (degrees or degrees/second depending on yaw input).| altitude depending on mount mode.| latitude, set if appropriate mount mode.| longitude, set if appropriate mount mode.| Mount mode.| */ - public static final int MAV_CMD_DO_SET_CAM_TRIGG_DIST = 206; /* Mission command to set camera trigger distance for this flight. The camera is triggered each time this distance is exceeded. This command can also be used to set the shutter integration time for the camera. |Camera trigger distance. 0 to stop triggering.| Camera shutter integration time. -1 or 0 to ignore| Trigger camera once immediately. (0 = no trigger, 1 = trigger)| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_FENCE_ENABLE = 207; /* Mission command to enable the geofence |enable? (0=disable, 1=enable, 2=disable_floor_only)| Empty| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_PARACHUTE = 208; /* Mission command to trigger a parachute |action| Empty| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_MOTOR_TEST = 209; /* Mission command to perform motor test. |Motor instance number. (from 1 to max number of motors on the vehicle)| Throttle type.| Throttle.| Timeout.| Motor count. (number of motors to test to test in sequence, waiting for the timeout above between them; 0=1 motor, 1=1 motor, 2=2 motors...)| Motor test order.| Empty| */ - public static final int MAV_CMD_DO_INVERTED_FLIGHT = 210; /* Change to/from inverted flight. |Inverted flight. (0=normal, 1=inverted)| Empty| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_GRIPPER = 211; /* Mission command to operate EPM gripper. |Gripper number (a number from 1 to max number of grippers on the vehicle).| Gripper action (0=release, 1=grab. See GRIPPER_ACTIONS enum).| Empty.| Empty.| Empty.| Empty.| Empty.| */ - public static final int MAV_CMD_DO_AUTOTUNE_ENABLE = 212; /* Enable/disable autotune. |Enable (1: enable, 0:disable).| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ - public static final int MAV_CMD_NAV_SET_YAW_SPEED = 213; /* Sets a desired vehicle turn angle and speed change. |Yaw angle to adjust steering by.| Speed.| Final angle. (0=absolute, 1=relative)| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_SET_CAM_TRIGG_INTERVAL = 214; /* Mission command to set camera trigger interval for this flight. If triggering is enabled, the camera is triggered each time this interval expires. This command can also be used to set the shutter integration time for the camera. |Camera trigger cycle time. -1 or 0 to ignore.| Camera shutter integration time. Should be less than trigger cycle time. -1 or 0 to ignore.| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_MOUNT_CONTROL_QUAT = 220; /* Mission command to control a camera or antenna mount, using a quaternion as reference. |quaternion param q1, w (1 in null-rotation)| quaternion param q2, x (0 in null-rotation)| quaternion param q3, y (0 in null-rotation)| quaternion param q4, z (0 in null-rotation)| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_GUIDED_MASTER = 221; /* set id of master controller |System ID| Component ID| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_GUIDED_LIMITS = 222; /* Set limits for external control |Timeout - maximum time that external controller will be allowed to control vehicle. 0 means no timeout.| Altitude (MSL) min - if vehicle moves below this alt, the command will be aborted and the mission will continue. 0 means no lower altitude limit.| Altitude (MSL) max - if vehicle moves above this alt, the command will be aborted and the mission will continue. 0 means no upper altitude limit.| Horizontal move limit - if vehicle moves more than this distance from its location at the moment the command was executed, the command will be aborted and the mission will continue. 0 means no horizontal move limit.| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_ENGINE_CONTROL = 223; /* Control vehicle engine. This is interpreted by the vehicles engine controller to change the target engine state. It is intended for vehicles with internal combustion engines |0: Stop engine, 1:Start Engine| 0: Warm start, 1:Cold start. Controls use of choke where applicable| Height delay. This is for commanding engine start only after the vehicle has gained the specified height. Used in VTOL vehicles during takeoff to start engine after the aircraft is off the ground. Zero for no delay.| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_SET_MISSION_CURRENT = 224; /* Set the mission item with sequence number seq as current item. This means that the MAV will continue to this mission item on the shortest path (not following the mission items in-between). |Mission sequence value to set| Empty| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_DO_LAST = 240; /* NOP - This command is only used to mark the upper limit of the DO commands in the enumeration |Empty| Empty| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_PREFLIGHT_CALIBRATION = 241; /* Trigger calibration. This command will be only accepted if in pre-flight mode. Except for Temperature Calibration, only one sensor should be set in a single message and all others should be zero. |1: gyro calibration, 3: gyro temperature calibration| 1: magnetometer calibration| 1: ground pressure calibration| 1: radio RC calibration, 2: RC trim calibration| 1: accelerometer calibration, 2: board level calibration, 3: accelerometer temperature calibration, 4: simple accelerometer calibration| 1: APM: compass/motor interference calibration (PX4: airspeed calibration, deprecated), 2: airspeed calibration| 1: ESC calibration, 3: barometer temperature calibration| */ - public static final int MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS = 242; /* Set sensor offsets. This command will be only accepted if in pre-flight mode. |Sensor to adjust the offsets for: 0: gyros, 1: accelerometer, 2: magnetometer, 3: barometer, 4: optical flow, 5: second magnetometer, 6: third magnetometer| X axis offset (or generic dimension 1), in the sensor's raw units| Y axis offset (or generic dimension 2), in the sensor's raw units| Z axis offset (or generic dimension 3), in the sensor's raw units| Generic dimension 4, in the sensor's raw units| Generic dimension 5, in the sensor's raw units| Generic dimension 6, in the sensor's raw units| */ - public static final int MAV_CMD_PREFLIGHT_UAVCAN = 243; /* Trigger UAVCAN config. This command will be only accepted if in pre-flight mode. |1: Trigger actuator ID assignment and direction mapping.| Reserved| Reserved| Reserved| Reserved| Reserved| Reserved| */ - public static final int MAV_CMD_PREFLIGHT_STORAGE = 245; /* Request storage of different parameter values and logs. This command will be only accepted if in pre-flight mode. |Parameter storage: 0: READ FROM FLASH/EEPROM, 1: WRITE CURRENT TO FLASH/EEPROM, 2: Reset to defaults| Mission storage: 0: READ FROM FLASH/EEPROM, 1: WRITE CURRENT TO FLASH/EEPROM, 2: Reset to defaults| Onboard logging: 0: Ignore, 1: Start default rate logging, -1: Stop logging, > 1: logging rate (e.g. set to 1000 for 1000 Hz logging)| Reserved| Empty| Empty| Empty| */ - public static final int MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN = 246; /* Request the reboot or shutdown of system components. |0: Do nothing for autopilot, 1: Reboot autopilot, 2: Shutdown autopilot, 3: Reboot autopilot and keep it in the bootloader until upgraded.| 0: Do nothing for onboard computer, 1: Reboot onboard computer, 2: Shutdown onboard computer, 3: Reboot onboard computer and keep it in the bootloader until upgraded.| WIP: 0: Do nothing for camera, 1: Reboot onboard camera, 2: Shutdown onboard camera, 3: Reboot onboard camera and keep it in the bootloader until upgraded| WIP: 0: Do nothing for mount (e.g. gimbal), 1: Reboot mount, 2: Shutdown mount, 3: Reboot mount and keep it in the bootloader until upgraded| Reserved, send 0| Reserved, send 0| WIP: ID (e.g. camera ID -1 for all IDs)| */ - public static final int MAV_CMD_OVERRIDE_GOTO = 252; /* Override current mission with command to pause mission, pause mission and move to position, continue/resume mission. When param 1 indicates that the mission is paused (MAV_GOTO_DO_HOLD), param 2 defines whether it holds in place or moves to another position. |MAV_GOTO_DO_HOLD: pause mission and either hold or move to specified position (depending on param2), MAV_GOTO_DO_CONTINUE: resume mission.| MAV_GOTO_HOLD_AT_CURRENT_POSITION: hold at current position, MAV_GOTO_HOLD_AT_SPECIFIED_POSITION: hold at specified position.| Coordinate frame of hold point.| Desired yaw angle.| Latitude / X position.| Longitude / Y position.| Altitude / Z position.| */ - public static final int MAV_CMD_MISSION_START = 300; /* start running a mission |first_item: the first mission item to run| last_item: the last mission item to run (after this item is run, the mission ends)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_COMPONENT_ARM_DISARM = 400; /* Arms / Disarms a component |0: disarm, 1: arm| 0: arm-disarm unless prevented by safety checks (i.e. when landed), 21196: force arming/disarming (e.g. allow arming to override preflight checks and disarming in flight)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_ILLUMINATOR_ON_OFF = 405; /* Turns illuminators ON/OFF. An illuminator is a light source that is used for lighting up dark areas external to the sytstem: e.g. a torch or searchlight (as opposed to a light source for illuminating the system itself, e.g. an indicator light). |0: Illuminators OFF, 1: Illuminators ON| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_GET_HOME_POSITION = 410; /* Request the home position from the vehicle. |Reserved| Reserved| Reserved| Reserved| Reserved| Reserved| Reserved| */ - public static final int MAV_CMD_START_RX_PAIR = 500; /* Starts receiver pairing. |0:Spektrum.| RC type.| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_GET_MESSAGE_INTERVAL = 510; /* Request the interval between messages for a particular MAVLink message ID. The receiver should ACK the command and then emit its response in a MESSAGE_INTERVAL message. |The MAVLink message ID| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_SET_MESSAGE_INTERVAL = 511; /* Set the interval between messages for a particular MAVLink message ID. This interface replaces REQUEST_DATA_STREAM. |The MAVLink message ID| The interval between two messages. Set to -1 to disable and 0 to request default rate.| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Target address of message stream (if message has target address fields). 0: Flight-stack default (recommended), 1: address of requestor, 2: broadcast.| */ - public static final int MAV_CMD_REQUEST_MESSAGE = 512; /* Request the target system(s) emit a single instance of a specified message (i.e. a "one-shot" version of MAV_CMD_SET_MESSAGE_INTERVAL). |The MAVLink message ID of the requested message.| Index id (if appropriate). The use of this parameter (if any), must be defined in the requested message.| The use of this parameter (if any), must be defined in the requested message. By default assumed not used (0).| The use of this parameter (if any), must be defined in the requested message. By default assumed not used (0).| The use of this parameter (if any), must be defined in the requested message. By default assumed not used (0).| The use of this parameter (if any), must be defined in the requested message. By default assumed not used (0).| Target address for requested message (if message has target address fields). 0: Flight-stack default, 1: address of requestor, 2: broadcast.| */ - public static final int MAV_CMD_REQUEST_PROTOCOL_VERSION = 519; /* Request MAVLink protocol version compatibility |1: Request supported protocol versions by all nodes on the network| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES = 520; /* Request autopilot capabilities. The receiver should ACK the command and then emit its capabilities in an AUTOPILOT_VERSION message |1: Request autopilot version| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_REQUEST_CAMERA_INFORMATION = 521; /* Request camera information (CAMERA_INFORMATION). |0: No action 1: Request camera capabilities| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_REQUEST_CAMERA_SETTINGS = 522; /* Request camera settings (CAMERA_SETTINGS). |0: No Action 1: Request camera settings| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_REQUEST_STORAGE_INFORMATION = 525; /* Request storage information (STORAGE_INFORMATION). Use the command's target_component to target a specific component's storage. |Storage ID (0 for all, 1 for first, 2 for second, etc.)| 0: No Action 1: Request storage information| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_STORAGE_FORMAT = 526; /* Format a storage medium. Once format is complete, a STORAGE_INFORMATION message is sent. Use the command's target_component to target a specific component's storage. |Storage ID (1 for first, 2 for second, etc.)| 0: No action 1: Format storage| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_REQUEST_CAMERA_CAPTURE_STATUS = 527; /* Request camera capture status (CAMERA_CAPTURE_STATUS) |0: No Action 1: Request camera capture status| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_REQUEST_FLIGHT_INFORMATION = 528; /* Request flight information (FLIGHT_INFORMATION) |1: Request flight information| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_RESET_CAMERA_SETTINGS = 529; /* Reset all camera settings to Factory Default |0: No Action 1: Reset all settings| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_SET_CAMERA_MODE = 530; /* Set camera running mode. Use NaN for reserved values. GCS will send a MAV_CMD_REQUEST_VIDEO_STREAM_STATUS command after a mode change if the camera supports video streaming. |Reserved (Set to 0)| Camera mode| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_SET_CAMERA_ZOOM = 531; /* Set camera zoom. Camera must respond with a CAMERA_SETTINGS message (on success). Use NaN for reserved values. |Zoom type| Zoom value. The range of valid values depend on the zoom type.| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_SET_CAMERA_FOCUS = 532; /* Set camera focus. Camera must respond with a CAMERA_SETTINGS message (on success). Use NaN for reserved values. |Focus type| Focus value| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_JUMP_TAG = 600; /* Tagged jump target. Can be jumped to with MAV_CMD_DO_JUMP_TAG. |Tag.| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_DO_JUMP_TAG = 601; /* Jump to the matching tag in the mission list. Repeat this action for the specified number of times. A mission should contain a single matching tag for each jump. If this is not the case then a jump to a missing tag should complete the mission, and a jump where there are multiple matching tags should always select the one with the lowest mission sequence number. |Target tag to jump to.| Repeat count.| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_IMAGE_START_CAPTURE = 2000; /* Start image capture sequence. Sends CAMERA_IMAGE_CAPTURED after each capture. Use NaN for reserved values. |Reserved (Set to 0)| Desired elapsed time between two consecutive pictures (in seconds). Minimum values depend on hardware (typically greater than 2 seconds).| Total number of images to capture. 0 to capture forever/until MAV_CMD_IMAGE_STOP_CAPTURE.| Capture sequence number starting from 1. This is only valid for single-capture (param3 == 1). Increment the capture ID for each capture command to prevent double captures when a command is re-transmitted. Use 0 to ignore it.| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_IMAGE_STOP_CAPTURE = 2001; /* Stop image capture sequence Use NaN for reserved values. |Reserved (Set to 0)| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_REQUEST_CAMERA_IMAGE_CAPTURE = 2002; /* Re-request a CAMERA_IMAGE_CAPTURE message. Use NaN for reserved values. |Sequence number for missing CAMERA_IMAGE_CAPTURE message| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_DO_TRIGGER_CONTROL = 2003; /* Enable or disable on-board camera triggering system. |Trigger enable/disable (0 for disable, 1 for start), -1 to ignore| 1 to reset the trigger sequence, -1 or 0 to ignore| 1 to pause triggering, but without switching the camera off or retracting it. -1 to ignore| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_VIDEO_START_CAPTURE = 2500; /* Starts video capture (recording). Use NaN for reserved values. |Video Stream ID (0 for all streams)| Frequency CAMERA_CAPTURE_STATUS messages should be sent while recording (0 for no messages, otherwise frequency)| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_VIDEO_STOP_CAPTURE = 2501; /* Stop the current video capture (recording). Use NaN for reserved values. |Video Stream ID (0 for all streams)| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_VIDEO_START_STREAMING = 2502; /* Start video streaming |Video Stream ID (0 for all streams, 1 for first, 2 for second, etc.)| Reserved| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_VIDEO_STOP_STREAMING = 2503; /* Stop the given video stream |Video Stream ID (0 for all streams, 1 for first, 2 for second, etc.)| Reserved| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_REQUEST_VIDEO_STREAM_INFORMATION = 2504; /* Request video stream information (VIDEO_STREAM_INFORMATION) |Video Stream ID (0 for all streams, 1 for first, 2 for second, etc.)| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_REQUEST_VIDEO_STREAM_STATUS = 2505; /* Request video stream status (VIDEO_STREAM_STATUS) |Video Stream ID (0 for all streams, 1 for first, 2 for second, etc.)| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_LOGGING_START = 2510; /* Request to start streaming logging data over MAVLink (see also LOGGING_DATA message) |Format: 0: ULog| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| */ - public static final int MAV_CMD_LOGGING_STOP = 2511; /* Request to stop streaming log data over MAVLink |Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| */ - public static final int MAV_CMD_AIRFRAME_CONFIGURATION = 2520; /* |Landing gear ID (default: 0, -1 for all)| Landing gear position (Down: 0, Up: 1, NaN for no change)| Reserved, set to NaN| Reserved, set to NaN| Reserved, set to NaN| Reserved, set to NaN| Reserved, set to NaN| */ - public static final int MAV_CMD_CONTROL_HIGH_LATENCY = 2600; /* Request to start/stop transmitting over the high latency telemetry |Control transmission over high latency telemetry (0: stop, 1: start)| Empty| Empty| Empty| Empty| Empty| Empty| */ - public static final int MAV_CMD_PANORAMA_CREATE = 2800; /* Create a panorama at the current position |Viewing angle horizontal of the panorama (+- 0.5 the total angle)| Viewing angle vertical of panorama.| Speed of the horizontal rotation.| Speed of the vertical rotation.| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_DO_VTOL_TRANSITION = 3000; /* Request VTOL transition |The target VTOL state. Only MAV_VTOL_STATE_MC and MAV_VTOL_STATE_FW can be used.| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_ARM_AUTHORIZATION_REQUEST = 3001; /* Request authorization to arm the vehicle to a external entity, the arm authorizer is responsible to request all data that is needs from the vehicle before authorize or deny the request. If approved the progress of command_ack message should be set with period of time that this authorization is valid in seconds or in case it was denied it should be set with one of the reasons in ARM_AUTH_DENIED_REASON. + public static final int MAV_CMD_NAV_WAYPOINT = 16; /* Navigate to waypoint. |Hold time. (ignored by fixed wing, time to stay at waypoint for rotary wing)| Acceptance radius (if the sphere with this radius is hit, the waypoint counts as reached)| 0 to pass through the WP, if > 0 radius to pass by WP. Positive value for clockwise orbit, negative value for counter-clockwise orbit. Allows trajectory control.| Desired yaw angle at waypoint (rotary wing). NaN to use the current system yaw heading mode (e.g. yaw towards next waypoint, yaw to home, etc.).| Latitude| Longitude| Altitude| */ + public static final int MAV_CMD_NAV_LOITER_UNLIM = 17; /* Loiter around this waypoint an unlimited amount of time |Empty| Empty| Radius around waypoint. If positive loiter clockwise, else counter-clockwise| Desired yaw angle. NaN to use the current system yaw heading mode (e.g. yaw towards next waypoint, yaw to home, etc.).| Latitude| Longitude| Altitude| */ + public static final int MAV_CMD_NAV_LOITER_TURNS = 18; /* Loiter around this waypoint for X turns |Number of turns.| Empty| Radius around waypoint. If positive loiter clockwise, else counter-clockwise| Forward moving aircraft this sets exit xtrack location: 0 for center of loiter wp, 1 for exit location. Else, this is desired yaw angle. NaN to use the current system yaw heading mode (e.g. yaw towards next waypoint, yaw to home, etc.).| Latitude| Longitude| Altitude| */ + public static final int MAV_CMD_NAV_LOITER_TIME = 19; /* Loiter around this waypoint for X seconds |Loiter time.| Empty| Radius around waypoint. If positive loiter clockwise, else counter-clockwise.| Forward moving aircraft this sets exit xtrack location: 0 for center of loiter wp, 1 for exit location. Else, this is desired yaw angle. NaN to use the current system yaw heading mode (e.g. yaw towards next waypoint, yaw to home, etc.).| Latitude| Longitude| Altitude| */ + public static final int MAV_CMD_NAV_RETURN_TO_LAUNCH = 20; /* Return to launch location |Empty| Empty| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_NAV_LAND = 21; /* Land at location. |Minimum target altitude if landing is aborted (0 = undefined/use system default).| Precision land mode.| Empty.| Desired yaw angle. NaN to use the current system yaw heading mode (e.g. yaw towards next waypoint, yaw to home, etc.).| Latitude.| Longitude.| Landing altitude (ground level in current frame).| */ + public static final int MAV_CMD_NAV_TAKEOFF = 22; /* Takeoff from ground / hand |Minimum pitch (if airspeed sensor present), desired pitch without sensor| Empty| Empty| Yaw angle (if magnetometer present), ignored without magnetometer. NaN to use the current system yaw heading mode (e.g. yaw towards next waypoint, yaw to home, etc.).| Latitude| Longitude| Altitude| */ + public static final int MAV_CMD_NAV_LAND_LOCAL = 23; /* Land at local position (local frame only) |Landing target number (if available)| Maximum accepted offset from desired landing position - computed magnitude from spherical coordinates: d = sqrt(x^2 + y^2 + z^2), which gives the maximum accepted distance between the desired landing position and the position where the vehicle is about to land| Landing descend rate| Desired yaw angle| Y-axis position| X-axis position| Z-axis / ground level position| */ + public static final int MAV_CMD_NAV_TAKEOFF_LOCAL = 24; /* Takeoff from local position (local frame only) |Minimum pitch (if airspeed sensor present), desired pitch without sensor| Empty| Takeoff ascend rate| Yaw angle (if magnetometer or another yaw estimation source present), ignored without one of these| Y-axis position| X-axis position| Z-axis position| */ + public static final int MAV_CMD_NAV_FOLLOW = 25; /* Vehicle following, i.e. this waypoint represents the position of a moving vehicle |Following logic to use (e.g. loitering or sinusoidal following) - depends on specific autopilot implementation| Ground speed of vehicle to be followed| Radius around waypoint. If positive loiter clockwise, else counter-clockwise| Desired yaw angle.| Latitude| Longitude| Altitude| */ + public static final int MAV_CMD_NAV_CONTINUE_AND_CHANGE_ALT = 30; /* Continue on the current course and climb/descend to specified altitude. When the altitude is reached continue to the next command (i.e., don't proceed to the next command until the desired altitude is reached. |Climb or Descend (0 = Neutral, command completes when within 5m of this command's altitude, 1 = Climbing, command completes when at or above this command's altitude, 2 = Descending, command completes when at or below this command's altitude.| Empty| Empty| Empty| Empty| Empty| Desired altitude| */ + public static final int MAV_CMD_NAV_LOITER_TO_ALT = 31; /* Begin loiter at the specified Latitude and Longitude. If Lat=Lon=0, then loiter at the current position. Don't consider the navigation command complete (don't leave loiter) until the altitude has been reached. Additionally, if the Heading Required parameter is non-zero the aircraft will not leave the loiter until heading toward the next waypoint. |Heading Required (0 = False)| Radius. If positive loiter clockwise, negative counter-clockwise, 0 means no change to standard loiter.| Empty| Forward moving aircraft this sets exit xtrack location: 0 for center of loiter wp, 1 for exit location| Latitude| Longitude| Altitude| */ + public static final int MAV_CMD_DO_FOLLOW = 32; /* Begin following a target |System ID (of the FOLLOW_TARGET beacon). Send 0 to disable follow-me and return to the default position hold mode.| RESERVED| RESERVED| Altitude mode: 0: Keep current altitude, 1: keep altitude difference to target, 2: go to a fixed altitude above home.| Altitude above home. (used if mode=2)| RESERVED| Time to land in which the MAV should go to the default position hold mode after a message RX timeout.| */ + public static final int MAV_CMD_DO_FOLLOW_REPOSITION = 33; /* Reposition the MAV after a follow target command has been sent |Camera q1 (where 0 is on the ray from the camera to the tracking device)| Camera q2| Camera q3| Camera q4| altitude offset from target| X offset from target| Y offset from target| */ + public static final int MAV_CMD_DO_ORBIT = 34; /* Start orbiting on the circumference of a circle defined by the parameters. Setting any value NaN results in using defaults. |Radius of the circle. positive: Orbit clockwise. negative: Orbit counter-clockwise.| Tangential Velocity. NaN: Vehicle configuration default.| Yaw behavior of the vehicle.| Reserved (e.g. for dynamic center beacon options)| Center point latitude (if no MAV_FRAME specified) / X coordinate according to MAV_FRAME. NaN: Use current vehicle position or current center if already orbiting.| Center point longitude (if no MAV_FRAME specified) / Y coordinate according to MAV_FRAME. NaN: Use current vehicle position or current center if already orbiting.| Center point altitude (MSL) (if no MAV_FRAME specified) / Z coordinate according to MAV_FRAME. NaN: Use current vehicle position or current center if already orbiting.| */ + public static final int MAV_CMD_NAV_ROI = 80; /* Sets the region of interest (ROI) for a sensor set or the vehicle itself. This can then be used by the vehicles control system to control the vehicle attitude and the attitude of various sensors such as cameras. |Region of interest mode.| Waypoint index/ target ID. (see MAV_ROI enum)| ROI index (allows a vehicle to manage multiple ROI's)| Empty| x the location of the fixed ROI (see MAV_FRAME)| y| z| */ + public static final int MAV_CMD_NAV_PATHPLANNING = 81; /* Control autonomous path planning on the MAV. |0: Disable local obstacle avoidance / local path planning (without resetting map), 1: Enable local path planning, 2: Enable and reset local path planning| 0: Disable full path planning (without resetting map), 1: Enable, 2: Enable and reset map/occupancy grid, 3: Enable and reset planned route, but not occupancy grid| Empty| Yaw angle at goal| Latitude/X of goal| Longitude/Y of goal| Altitude/Z of goal| */ + public static final int MAV_CMD_NAV_SPLINE_WAYPOINT = 82; /* Navigate to waypoint using a spline path. |Hold time. (ignored by fixed wing, time to stay at waypoint for rotary wing)| Empty| Empty| Empty| Latitude/X of goal| Longitude/Y of goal| Altitude/Z of goal| */ + public static final int MAV_CMD_NAV_ALTITUDE_WAIT = 83; /* Mission command to wait for an altitude or downwards vertical speed. This is meant for high altitude balloon launches, allowing the aircraft to be idle until either an altitude is reached or a negative vertical speed is reached (indicating early balloon burst). The wiggle time is how often to wiggle the control surfaces to prevent them seizing up. |Altitude (m).| Descent speed (m/s).| Wiggle Time (s).| Empty.| Empty.| Empty.| Empty.| */ + public static final int MAV_CMD_NAV_VTOL_TAKEOFF = 84; /* Takeoff from ground using VTOL mode, and transition to forward flight with specified heading. |Empty| Front transition heading.| Empty| Yaw angle. NaN to use the current system yaw heading mode (e.g. yaw towards next waypoint, yaw to home, etc.).| Latitude| Longitude| Altitude| */ + public static final int MAV_CMD_NAV_VTOL_LAND = 85; /* Land using VTOL mode |Empty| Empty| Approach altitude (with the same reference as the Altitude field). NaN if unspecified.| Yaw angle. NaN to use the current system yaw heading mode (e.g. yaw towards next waypoint, yaw to home, etc.).| Latitude| Longitude| Altitude (ground level)| */ + public static final int MAV_CMD_NAV_GUIDED_ENABLE = 92; /* hand control over to an external controller |On / Off (> 0.5f on)| Empty| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_NAV_DELAY = 93; /* Delay the next navigation command a number of seconds or until a specified time |Delay (-1 to enable time-of-day fields)| hour (24h format, UTC, -1 to ignore)| minute (24h format, UTC, -1 to ignore)| second (24h format, UTC)| Empty| Empty| Empty| */ + public static final int MAV_CMD_NAV_PAYLOAD_PLACE = 94; /* Descend and place payload. Vehicle moves to specified location, descends until it detects a hanging payload has reached the ground, and then releases the payload. If ground is not detected before the reaching the maximum descent value (param1), the command will complete without releasing the payload. |Maximum distance to descend.| Empty| Empty| Empty| Latitude| Longitude| Altitude| */ + public static final int MAV_CMD_NAV_LAST = 95; /* NOP - This command is only used to mark the upper limit of the NAV/ACTION commands in the enumeration |Empty| Empty| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_CONDITION_DELAY = 112; /* Delay mission state machine. |Delay| Empty| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_CONDITION_CHANGE_ALT = 113; /* Ascend/descend at rate. Delay mission state machine until desired altitude reached. |Descent / Ascend rate.| Empty| Empty| Empty| Empty| Empty| Finish Altitude| */ + public static final int MAV_CMD_CONDITION_DISTANCE = 114; /* Delay mission state machine until within desired distance of next NAV point. |Distance.| Empty| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_CONDITION_YAW = 115; /* Reach a certain target angle. |target angle, 0 is north| angular speed| direction: -1: counter clockwise, 1: clockwise| 0: absolute angle, 1: relative offset| Empty| Empty| Empty| */ + public static final int MAV_CMD_CONDITION_LAST = 159; /* NOP - This command is only used to mark the upper limit of the CONDITION commands in the enumeration |Empty| Empty| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_SET_MODE = 176; /* Set system mode. |Mode| Custom mode - this is system specific, please refer to the individual autopilot specifications for details.| Custom sub mode - this is system specific, please refer to the individual autopilot specifications for details.| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_JUMP = 177; /* Jump to the desired command in the mission list. Repeat this action only the specified number of times |Sequence number| Repeat count| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_CHANGE_SPEED = 178; /* Change speed and/or throttle set points. |Speed type (0=Airspeed, 1=Ground Speed, 2=Climb Speed, 3=Descent Speed)| Speed (-1 indicates no change)| Throttle (-1 indicates no change)| 0: absolute, 1: relative| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_SET_HOME = 179; /* Changes the home location either to the current location or a specified location. |Use current (1=use current location, 0=use specified location)| Empty| Empty| Empty| Latitude| Longitude| Altitude| */ + public static final int MAV_CMD_DO_SET_PARAMETER = 180; /* Set a system parameter. Caution! Use of this command requires knowledge of the numeric enumeration value of the parameter. |Parameter number| Parameter value| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_SET_RELAY = 181; /* Set a relay to a condition. |Relay instance number.| Setting. (1=on, 0=off, others possible depending on system hardware)| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_REPEAT_RELAY = 182; /* Cycle a relay on and off for a desired number of cycles with a desired period. |Relay instance number.| Cycle count.| Cycle time.| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_SET_SERVO = 183; /* Set a servo to a desired PWM value. |Servo instance number.| Pulse Width Modulation.| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_REPEAT_SERVO = 184; /* Cycle a between its nominal setting and a desired PWM for a desired number of cycles with a desired period. |Servo instance number.| Pulse Width Modulation.| Cycle count.| Cycle time.| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_FLIGHTTERMINATION = 185; /* Terminate flight immediately |Flight termination activated if > 0.5| Empty| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_CHANGE_ALTITUDE = 186; /* Change altitude set point. |Altitude.| Frame of new altitude.| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_LAND_START = 189; /* Mission command to perform a landing. This is used as a marker in a mission to tell the autopilot where a sequence of mission items that represents a landing starts. It may also be sent via a COMMAND_LONG to trigger a landing, in which case the nearest (geographically) landing sequence in the mission will be used. The Latitude/Longitude is optional, and may be set to 0 if not needed. If specified then it will be used to help find the closest landing sequence. |Empty| Empty| Empty| Empty| Latitude| Longitude| Empty| */ + public static final int MAV_CMD_DO_RALLY_LAND = 190; /* Mission command to perform a landing from a rally point. |Break altitude| Landing speed| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_GO_AROUND = 191; /* Mission command to safely abort an autonomous landing. |Altitude| Empty| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_REPOSITION = 192; /* Reposition the vehicle to a specific WGS84 global position. |Ground speed, less than 0 (-1) for default| Bitmask of option flags.| Reserved| Yaw heading. NaN to use the current system yaw heading mode (e.g. yaw towards next waypoint, yaw to home, etc.). For planes indicates loiter direction (0: clockwise, 1: counter clockwise)| Latitude| Longitude| Altitude (meters)| */ + public static final int MAV_CMD_DO_PAUSE_CONTINUE = 193; /* If in a GPS controlled position mode, hold the current position or continue. |0: Pause current mission or reposition command, hold current position. 1: Continue mission. A VTOL capable vehicle should enter hover mode (multicopter and VTOL planes). A plane should loiter with the default loiter radius.| Reserved| Reserved| Reserved| Reserved| Reserved| Reserved| */ + public static final int MAV_CMD_DO_SET_REVERSE = 194; /* Set moving direction to forward or reverse. |Direction (0=Forward, 1=Reverse)| Empty| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_SET_ROI_LOCATION = 195; /* Sets the region of interest (ROI) to a location. This can then be used by the vehicles control system to control the vehicle attitude and the attitude of various sensors such as cameras. |Empty| Empty| Empty| Empty| Latitude| Longitude| Altitude| */ + public static final int MAV_CMD_DO_SET_ROI_WPNEXT_OFFSET = 196; /* Sets the region of interest (ROI) to be toward next waypoint, with optional pitch/roll/yaw offset. This can then be used by the vehicles control system to control the vehicle attitude and the attitude of various sensors such as cameras. |Empty| Empty| Empty| Empty| pitch offset from next waypoint| roll offset from next waypoint| yaw offset from next waypoint| */ + public static final int MAV_CMD_DO_SET_ROI_NONE = 197; /* Cancels any previous ROI command returning the vehicle/sensors to default flight characteristics. This can then be used by the vehicles control system to control the vehicle attitude and the attitude of various sensors such as cameras. |Empty| Empty| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_SET_ROI_SYSID = 198; /* Mount tracks system with specified system ID. Determination of target vehicle position may be done with GLOBAL_POSITION_INT or any other means. |sysid| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_DO_CONTROL_VIDEO = 200; /* Control onboard camera system. |Camera ID (-1 for all)| Transmission: 0: disabled, 1: enabled compressed, 2: enabled raw| Transmission mode: 0: video stream, >0: single images every n seconds| Recording: 0: disabled, 1: enabled compressed, 2: enabled raw| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_SET_ROI = 201; /* Sets the region of interest (ROI) for a sensor set or the vehicle itself. This can then be used by the vehicles control system to control the vehicle attitude and the attitude of various sensors such as cameras. |Region of interest mode.| Waypoint index/ target ID (depends on param 1).| Region of interest index. (allows a vehicle to manage multiple ROI's)| Empty| MAV_ROI_WPNEXT: pitch offset from next waypoint, MAV_ROI_LOCATION: latitude| MAV_ROI_WPNEXT: roll offset from next waypoint, MAV_ROI_LOCATION: longitude| MAV_ROI_WPNEXT: yaw offset from next waypoint, MAV_ROI_LOCATION: altitude| */ + public static final int MAV_CMD_DO_DIGICAM_CONFIGURE = 202; /* Configure digital camera. This is a fallback message for systems that have not yet implemented PARAM_EXT_XXX messages and camera definition files (see https://mavlink.io/en/services/camera_def.html ). |Modes: P, TV, AV, M, Etc.| Shutter speed: Divisor number for one second.| Aperture: F stop number.| ISO number e.g. 80, 100, 200, Etc.| Exposure type enumerator.| Command Identity.| Main engine cut-off time before camera trigger. (0 means no cut-off)| */ + public static final int MAV_CMD_DO_DIGICAM_CONTROL = 203; /* Control digital camera. This is a fallback message for systems that have not yet implemented PARAM_EXT_XXX messages and camera definition files (see https://mavlink.io/en/services/camera_def.html ). |Session control e.g. show/hide lens| Zoom's absolute position| Zooming step value to offset zoom from the current position| Focus Locking, Unlocking or Re-locking| Shooting Command| Command Identity| Test shot identifier. If set to 1, image will only be captured, but not counted towards internal frame count.| */ + public static final int MAV_CMD_DO_MOUNT_CONFIGURE = 204; /* Mission command to configure a camera or antenna mount |Mount operation mode| stabilize roll? (1 = yes, 0 = no)| stabilize pitch? (1 = yes, 0 = no)| stabilize yaw? (1 = yes, 0 = no)| roll input (0 = angle body frame, 1 = angular rate, 2 = angle absolute frame)| pitch input (0 = angle body frame, 1 = angular rate, 2 = angle absolute frame)| yaw input (0 = angle body frame, 1 = angular rate, 2 = angle absolute frame)| */ + public static final int MAV_CMD_DO_MOUNT_CONTROL = 205; /* Mission command to control a camera or antenna mount |pitch depending on mount mode (degrees or degrees/second depending on pitch input).| roll depending on mount mode (degrees or degrees/second depending on roll input).| yaw depending on mount mode (degrees or degrees/second depending on yaw input).| altitude depending on mount mode.| latitude, set if appropriate mount mode.| longitude, set if appropriate mount mode.| Mount mode.| */ + public static final int MAV_CMD_DO_SET_CAM_TRIGG_DIST = 206; /* Mission command to set camera trigger distance for this flight. The camera is triggered each time this distance is exceeded. This command can also be used to set the shutter integration time for the camera. |Camera trigger distance. 0 to stop triggering.| Camera shutter integration time. -1 or 0 to ignore| Trigger camera once immediately. (0 = no trigger, 1 = trigger)| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_FENCE_ENABLE = 207; /* Mission command to enable the geofence |enable? (0=disable, 1=enable, 2=disable_floor_only)| Empty| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_PARACHUTE = 208; /* Mission command to trigger a parachute |action| Empty| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_MOTOR_TEST = 209; /* Mission command to perform motor test. |Motor instance number. (from 1 to max number of motors on the vehicle)| Throttle type.| Throttle.| Timeout.| Motor count. (number of motors to test to test in sequence, waiting for the timeout above between them; 0=1 motor, 1=1 motor, 2=2 motors...)| Motor test order.| Empty| */ + public static final int MAV_CMD_DO_INVERTED_FLIGHT = 210; /* Change to/from inverted flight. |Inverted flight. (0=normal, 1=inverted)| Empty| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_GRIPPER = 211; /* Mission command to operate EPM gripper. |Gripper number (a number from 1 to max number of grippers on the vehicle).| Gripper action (0=release, 1=grab. See GRIPPER_ACTIONS enum).| Empty.| Empty.| Empty.| Empty.| Empty.| */ + public static final int MAV_CMD_DO_AUTOTUNE_ENABLE = 212; /* Enable/disable autotune. |Enable (1: enable, 0:disable).| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ + public static final int MAV_CMD_NAV_SET_YAW_SPEED = 213; /* Sets a desired vehicle turn angle and speed change. |Yaw angle to adjust steering by.| Speed.| Final angle. (0=absolute, 1=relative)| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_SET_CAM_TRIGG_INTERVAL = 214; /* Mission command to set camera trigger interval for this flight. If triggering is enabled, the camera is triggered each time this interval expires. This command can also be used to set the shutter integration time for the camera. |Camera trigger cycle time. -1 or 0 to ignore.| Camera shutter integration time. Should be less than trigger cycle time. -1 or 0 to ignore.| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_MOUNT_CONTROL_QUAT = 220; /* Mission command to control a camera or antenna mount, using a quaternion as reference. |quaternion param q1, w (1 in null-rotation)| quaternion param q2, x (0 in null-rotation)| quaternion param q3, y (0 in null-rotation)| quaternion param q4, z (0 in null-rotation)| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_GUIDED_MASTER = 221; /* set id of master controller |System ID| Component ID| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_GUIDED_LIMITS = 222; /* Set limits for external control |Timeout - maximum time that external controller will be allowed to control vehicle. 0 means no timeout.| Altitude (MSL) min - if vehicle moves below this alt, the command will be aborted and the mission will continue. 0 means no lower altitude limit.| Altitude (MSL) max - if vehicle moves above this alt, the command will be aborted and the mission will continue. 0 means no upper altitude limit.| Horizontal move limit - if vehicle moves more than this distance from its location at the moment the command was executed, the command will be aborted and the mission will continue. 0 means no horizontal move limit.| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_ENGINE_CONTROL = 223; /* Control vehicle engine. This is interpreted by the vehicles engine controller to change the target engine state. It is intended for vehicles with internal combustion engines |0: Stop engine, 1:Start Engine| 0: Warm start, 1:Cold start. Controls use of choke where applicable| Height delay. This is for commanding engine start only after the vehicle has gained the specified height. Used in VTOL vehicles during takeoff to start engine after the aircraft is off the ground. Zero for no delay.| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_SET_MISSION_CURRENT = 224; /* Set the mission item with sequence number seq as current item. This means that the MAV will continue to this mission item on the shortest path (not following the mission items in-between). |Mission sequence value to set| Empty| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_DO_LAST = 240; /* NOP - This command is only used to mark the upper limit of the DO commands in the enumeration |Empty| Empty| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_PREFLIGHT_CALIBRATION = 241; /* Trigger calibration. This command will be only accepted if in pre-flight mode. Except for Temperature Calibration, only one sensor should be set in a single message and all others should be zero. |1: gyro calibration, 3: gyro temperature calibration| 1: magnetometer calibration| 1: ground pressure calibration| 1: radio RC calibration, 2: RC trim calibration| 1: accelerometer calibration, 2: board level calibration, 3: accelerometer temperature calibration, 4: simple accelerometer calibration| 1: APM: compass/motor interference calibration (PX4: airspeed calibration, deprecated), 2: airspeed calibration| 1: ESC calibration, 3: barometer temperature calibration| */ + public static final int MAV_CMD_PREFLIGHT_SET_SENSOR_OFFSETS = 242; /* Set sensor offsets. This command will be only accepted if in pre-flight mode. |Sensor to adjust the offsets for: 0: gyros, 1: accelerometer, 2: magnetometer, 3: barometer, 4: optical flow, 5: second magnetometer, 6: third magnetometer| X axis offset (or generic dimension 1), in the sensor's raw units| Y axis offset (or generic dimension 2), in the sensor's raw units| Z axis offset (or generic dimension 3), in the sensor's raw units| Generic dimension 4, in the sensor's raw units| Generic dimension 5, in the sensor's raw units| Generic dimension 6, in the sensor's raw units| */ + public static final int MAV_CMD_PREFLIGHT_UAVCAN = 243; /* Trigger UAVCAN config. This command will be only accepted if in pre-flight mode. |1: Trigger actuator ID assignment and direction mapping.| Reserved| Reserved| Reserved| Reserved| Reserved| Reserved| */ + public static final int MAV_CMD_PREFLIGHT_STORAGE = 245; /* Request storage of different parameter values and logs. This command will be only accepted if in pre-flight mode. |Parameter storage: 0: READ FROM FLASH/EEPROM, 1: WRITE CURRENT TO FLASH/EEPROM, 2: Reset to defaults| Mission storage: 0: READ FROM FLASH/EEPROM, 1: WRITE CURRENT TO FLASH/EEPROM, 2: Reset to defaults| Onboard logging: 0: Ignore, 1: Start default rate logging, -1: Stop logging, > 1: logging rate (e.g. set to 1000 for 1000 Hz logging)| Reserved| Empty| Empty| Empty| */ + public static final int MAV_CMD_PREFLIGHT_REBOOT_SHUTDOWN = 246; /* Request the reboot or shutdown of system components. |0: Do nothing for autopilot, 1: Reboot autopilot, 2: Shutdown autopilot, 3: Reboot autopilot and keep it in the bootloader until upgraded.| 0: Do nothing for onboard computer, 1: Reboot onboard computer, 2: Shutdown onboard computer, 3: Reboot onboard computer and keep it in the bootloader until upgraded.| WIP: 0: Do nothing for camera, 1: Reboot onboard camera, 2: Shutdown onboard camera, 3: Reboot onboard camera and keep it in the bootloader until upgraded| WIP: 0: Do nothing for mount (e.g. gimbal), 1: Reboot mount, 2: Shutdown mount, 3: Reboot mount and keep it in the bootloader until upgraded| Reserved, send 0| Reserved, send 0| WIP: ID (e.g. camera ID -1 for all IDs)| */ + public static final int MAV_CMD_OVERRIDE_GOTO = 252; /* Override current mission with command to pause mission, pause mission and move to position, continue/resume mission. When param 1 indicates that the mission is paused (MAV_GOTO_DO_HOLD), param 2 defines whether it holds in place or moves to another position. |MAV_GOTO_DO_HOLD: pause mission and either hold or move to specified position (depending on param2), MAV_GOTO_DO_CONTINUE: resume mission.| MAV_GOTO_HOLD_AT_CURRENT_POSITION: hold at current position, MAV_GOTO_HOLD_AT_SPECIFIED_POSITION: hold at specified position.| Coordinate frame of hold point.| Desired yaw angle.| Latitude / X position.| Longitude / Y position.| Altitude / Z position.| */ + public static final int MAV_CMD_MISSION_START = 300; /* start running a mission |first_item: the first mission item to run| last_item: the last mission item to run (after this item is run, the mission ends)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_COMPONENT_ARM_DISARM = 400; /* Arms / Disarms a component |0: disarm, 1: arm| 0: arm-disarm unless prevented by safety checks (i.e. when landed), 21196: force arming/disarming (e.g. allow arming to override preflight checks and disarming in flight)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_ILLUMINATOR_ON_OFF = 405; /* Turns illuminators ON/OFF. An illuminator is a light source that is used for lighting up dark areas external to the sytstem: e.g. a torch or searchlight (as opposed to a light source for illuminating the system itself, e.g. an indicator light). |0: Illuminators OFF, 1: Illuminators ON| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_GET_HOME_POSITION = 410; /* Request the home position from the vehicle. |Reserved| Reserved| Reserved| Reserved| Reserved| Reserved| Reserved| */ + public static final int MAV_CMD_START_RX_PAIR = 500; /* Starts receiver pairing. |0:Spektrum.| RC type.| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_GET_MESSAGE_INTERVAL = 510; /* Request the interval between messages for a particular MAVLink message ID. The receiver should ACK the command and then emit its response in a MESSAGE_INTERVAL message. |The MAVLink message ID| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_SET_MESSAGE_INTERVAL = 511; /* Set the interval between messages for a particular MAVLink message ID. This interface replaces REQUEST_DATA_STREAM. |The MAVLink message ID| The interval between two messages. Set to -1 to disable and 0 to request default rate.| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Target address of message stream (if message has target address fields). 0: Flight-stack default (recommended), 1: address of requestor, 2: broadcast.| */ + public static final int MAV_CMD_REQUEST_MESSAGE = 512; /* Request the target system(s) emit a single instance of a specified message (i.e. a "one-shot" version of MAV_CMD_SET_MESSAGE_INTERVAL). |The MAVLink message ID of the requested message.| Index id (if appropriate). The use of this parameter (if any), must be defined in the requested message.| The use of this parameter (if any), must be defined in the requested message. By default assumed not used (0).| The use of this parameter (if any), must be defined in the requested message. By default assumed not used (0).| The use of this parameter (if any), must be defined in the requested message. By default assumed not used (0).| The use of this parameter (if any), must be defined in the requested message. By default assumed not used (0).| Target address for requested message (if message has target address fields). 0: Flight-stack default, 1: address of requestor, 2: broadcast.| */ + public static final int MAV_CMD_REQUEST_PROTOCOL_VERSION = 519; /* Request MAVLink protocol version compatibility |1: Request supported protocol versions by all nodes on the network| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_REQUEST_AUTOPILOT_CAPABILITIES = 520; /* Request autopilot capabilities. The receiver should ACK the command and then emit its capabilities in an AUTOPILOT_VERSION message |1: Request autopilot version| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_REQUEST_CAMERA_INFORMATION = 521; /* Request camera information (CAMERA_INFORMATION). |0: No action 1: Request camera capabilities| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_REQUEST_CAMERA_SETTINGS = 522; /* Request camera settings (CAMERA_SETTINGS). |0: No Action 1: Request camera settings| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_REQUEST_STORAGE_INFORMATION = 525; /* Request storage information (STORAGE_INFORMATION). Use the command's target_component to target a specific component's storage. |Storage ID (0 for all, 1 for first, 2 for second, etc.)| 0: No Action 1: Request storage information| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_STORAGE_FORMAT = 526; /* Format a storage medium. Once format is complete, a STORAGE_INFORMATION message is sent. Use the command's target_component to target a specific component's storage. |Storage ID (1 for first, 2 for second, etc.)| 0: No action 1: Format storage| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_REQUEST_CAMERA_CAPTURE_STATUS = 527; /* Request camera capture status (CAMERA_CAPTURE_STATUS) |0: No Action 1: Request camera capture status| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_REQUEST_FLIGHT_INFORMATION = 528; /* Request flight information (FLIGHT_INFORMATION) |1: Request flight information| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_RESET_CAMERA_SETTINGS = 529; /* Reset all camera settings to Factory Default |0: No Action 1: Reset all settings| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_SET_CAMERA_MODE = 530; /* Set camera running mode. Use NaN for reserved values. GCS will send a MAV_CMD_REQUEST_VIDEO_STREAM_STATUS command after a mode change if the camera supports video streaming. |Reserved (Set to 0)| Camera mode| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_SET_CAMERA_ZOOM = 531; /* Set camera zoom. Camera must respond with a CAMERA_SETTINGS message (on success). Use NaN for reserved values. |Zoom type| Zoom value. The range of valid values depend on the zoom type.| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_SET_CAMERA_FOCUS = 532; /* Set camera focus. Camera must respond with a CAMERA_SETTINGS message (on success). Use NaN for reserved values. |Focus type| Focus value| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_JUMP_TAG = 600; /* Tagged jump target. Can be jumped to with MAV_CMD_DO_JUMP_TAG. |Tag.| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_DO_JUMP_TAG = 601; /* Jump to the matching tag in the mission list. Repeat this action for the specified number of times. A mission should contain a single matching tag for each jump. If this is not the case then a jump to a missing tag should complete the mission, and a jump where there are multiple matching tags should always select the one with the lowest mission sequence number. |Target tag to jump to.| Repeat count.| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_IMAGE_START_CAPTURE = 2000; /* Start image capture sequence. Sends CAMERA_IMAGE_CAPTURED after each capture. Use NaN for reserved values. |Reserved (Set to 0)| Desired elapsed time between two consecutive pictures (in seconds). Minimum values depend on hardware (typically greater than 2 seconds).| Total number of images to capture. 0 to capture forever/until MAV_CMD_IMAGE_STOP_CAPTURE.| Capture sequence number starting from 1. This is only valid for single-capture (param3 == 1). Increment the capture ID for each capture command to prevent double captures when a command is re-transmitted. Use 0 to ignore it.| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_IMAGE_STOP_CAPTURE = 2001; /* Stop image capture sequence Use NaN for reserved values. |Reserved (Set to 0)| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_REQUEST_CAMERA_IMAGE_CAPTURE = 2002; /* Re-request a CAMERA_IMAGE_CAPTURE message. Use NaN for reserved values. |Sequence number for missing CAMERA_IMAGE_CAPTURE message| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_DO_TRIGGER_CONTROL = 2003; /* Enable or disable on-board camera triggering system. |Trigger enable/disable (0 for disable, 1 for start), -1 to ignore| 1 to reset the trigger sequence, -1 or 0 to ignore| 1 to pause triggering, but without switching the camera off or retracting it. -1 to ignore| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_VIDEO_START_CAPTURE = 2500; /* Starts video capture (recording). Use NaN for reserved values. |Video Stream ID (0 for all streams)| Frequency CAMERA_CAPTURE_STATUS messages should be sent while recording (0 for no messages, otherwise frequency)| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_VIDEO_STOP_CAPTURE = 2501; /* Stop the current video capture (recording). Use NaN for reserved values. |Video Stream ID (0 for all streams)| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_VIDEO_START_STREAMING = 2502; /* Start video streaming |Video Stream ID (0 for all streams, 1 for first, 2 for second, etc.)| Reserved| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_VIDEO_STOP_STREAMING = 2503; /* Stop the given video stream |Video Stream ID (0 for all streams, 1 for first, 2 for second, etc.)| Reserved| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_REQUEST_VIDEO_STREAM_INFORMATION = 2504; /* Request video stream information (VIDEO_STREAM_INFORMATION) |Video Stream ID (0 for all streams, 1 for first, 2 for second, etc.)| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_REQUEST_VIDEO_STREAM_STATUS = 2505; /* Request video stream status (VIDEO_STREAM_STATUS) |Video Stream ID (0 for all streams, 1 for first, 2 for second, etc.)| Reserved (all remaining params)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_LOGGING_START = 2510; /* Request to start streaming logging data over MAVLink (see also LOGGING_DATA message) |Format: 0: ULog| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| */ + public static final int MAV_CMD_LOGGING_STOP = 2511; /* Request to stop streaming log data over MAVLink |Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| */ + public static final int MAV_CMD_AIRFRAME_CONFIGURATION = 2520; /* |Landing gear ID (default: 0, -1 for all)| Landing gear position (Down: 0, Up: 1, NaN for no change)| Reserved, set to NaN| Reserved, set to NaN| Reserved, set to NaN| Reserved, set to NaN| Reserved, set to NaN| */ + public static final int MAV_CMD_CONTROL_HIGH_LATENCY = 2600; /* Request to start/stop transmitting over the high latency telemetry |Control transmission over high latency telemetry (0: stop, 1: start)| Empty| Empty| Empty| Empty| Empty| Empty| */ + public static final int MAV_CMD_PANORAMA_CREATE = 2800; /* Create a panorama at the current position |Viewing angle horizontal of the panorama (+- 0.5 the total angle)| Viewing angle vertical of panorama.| Speed of the horizontal rotation.| Speed of the vertical rotation.| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_DO_VTOL_TRANSITION = 3000; /* Request VTOL transition |The target VTOL state. Only MAV_VTOL_STATE_MC and MAV_VTOL_STATE_FW can be used.| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_ARM_AUTHORIZATION_REQUEST = 3001; /* Request authorization to arm the vehicle to a external entity, the arm authorizer is responsible to request all data that is needs from the vehicle before authorize or deny the request. If approved the progress of command_ack message should be set with period of time that this authorization is valid in seconds or in case it was denied it should be set with one of the reasons in ARM_AUTH_DENIED_REASON. |Vehicle system id, this way ground station can request arm authorization on behalf of any vehicle| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_SET_GUIDED_SUBMODE_STANDARD = 4000; /* This command sets the submode to standard guided when vehicle is in guided mode. The vehicle holds position and altitude and the user can input the desired velocities along all three axes. + public static final int MAV_CMD_SET_GUIDED_SUBMODE_STANDARD = 4000; /* This command sets the submode to standard guided when vehicle is in guided mode. The vehicle holds position and altitude and the user can input the desired velocities along all three axes. |Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_SET_GUIDED_SUBMODE_CIRCLE = 4001; /* This command sets submode circle when vehicle is in guided mode. Vehicle flies along a circle facing the center of the circle. The user can input the velocity along the circle and change the radius. If no input is given the vehicle will hold position. + public static final int MAV_CMD_SET_GUIDED_SUBMODE_CIRCLE = 4001; /* This command sets submode circle when vehicle is in guided mode. Vehicle flies along a circle facing the center of the circle. The user can input the velocity along the circle and change the radius. If no input is given the vehicle will hold position. |Radius of desired circle in CIRCLE_MODE| User defined| User defined| User defined| Unscaled target latitude of center of circle in CIRCLE_MODE| Unscaled target longitude of center of circle in CIRCLE_MODE| Reserved (default:0)| */ - public static final int MAV_CMD_CONDITION_GATE = 4501; /* Delay mission state machine until gate has been reached. |Geometry: 0: orthogonal to path between previous and next waypoint.| Altitude: 0: ignore altitude| Empty| Empty| Latitude| Longitude| Altitude| */ - public static final int MAV_CMD_NAV_FENCE_RETURN_POINT = 5000; /* Fence return point. There can only be one fence return point. + public static final int MAV_CMD_CONDITION_GATE = 4501; /* Delay mission state machine until gate has been reached. |Geometry: 0: orthogonal to path between previous and next waypoint.| Altitude: 0: ignore altitude| Empty| Empty| Latitude| Longitude| Altitude| */ + public static final int MAV_CMD_NAV_FENCE_RETURN_POINT = 5000; /* Fence return point. There can only be one fence return point. |Reserved| Reserved| Reserved| Reserved| Latitude| Longitude| Altitude| */ - public static final int MAV_CMD_NAV_FENCE_POLYGON_VERTEX_INCLUSION = 5001; /* Fence vertex for an inclusion polygon (the polygon must not be self-intersecting). The vehicle must stay within this area. Minimum of 3 vertices required. + public static final int MAV_CMD_NAV_FENCE_POLYGON_VERTEX_INCLUSION = 5001; /* Fence vertex for an inclusion polygon (the polygon must not be self-intersecting). The vehicle must stay within this area. Minimum of 3 vertices required. |Polygon vertex count| Reserved| Reserved| Reserved| Latitude| Longitude| Reserved| */ - public static final int MAV_CMD_NAV_FENCE_POLYGON_VERTEX_EXCLUSION = 5002; /* Fence vertex for an exclusion polygon (the polygon must not be self-intersecting). The vehicle must stay outside this area. Minimum of 3 vertices required. + public static final int MAV_CMD_NAV_FENCE_POLYGON_VERTEX_EXCLUSION = 5002; /* Fence vertex for an exclusion polygon (the polygon must not be self-intersecting). The vehicle must stay outside this area. Minimum of 3 vertices required. |Polygon vertex count| Reserved| Reserved| Reserved| Latitude| Longitude| Reserved| */ - public static final int MAV_CMD_NAV_FENCE_CIRCLE_INCLUSION = 5003; /* Circular fence area. The vehicle must stay inside this area. + public static final int MAV_CMD_NAV_FENCE_CIRCLE_INCLUSION = 5003; /* Circular fence area. The vehicle must stay inside this area. |Radius.| Reserved| Reserved| Reserved| Latitude| Longitude| Reserved| */ - public static final int MAV_CMD_NAV_FENCE_CIRCLE_EXCLUSION = 5004; /* Circular fence area. The vehicle must stay outside this area. + public static final int MAV_CMD_NAV_FENCE_CIRCLE_EXCLUSION = 5004; /* Circular fence area. The vehicle must stay outside this area. |Radius.| Reserved| Reserved| Reserved| Latitude| Longitude| Reserved| */ - public static final int MAV_CMD_NAV_RALLY_POINT = 5100; /* Rally point. You can have multiple rally points defined. + public static final int MAV_CMD_NAV_RALLY_POINT = 5100; /* Rally point. You can have multiple rally points defined. |Reserved| Reserved| Reserved| Reserved| Latitude| Longitude| Altitude| */ - public static final int MAV_CMD_UAVCAN_GET_NODE_INFO = 5200; /* Commands the vehicle to respond with a sequence of messages UAVCAN_NODE_INFO, one message per every UAVCAN node that is online. Note that some of the response messages can be lost, which the receiver can detect easily by checking whether every received UAVCAN_NODE_STATUS has a matching message UAVCAN_NODE_INFO received earlier; if not, this command should be sent again in order to request re-transmission of the node information messages. |Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| */ - public static final int MAV_CMD_PAYLOAD_PREPARE_DEPLOY = 30001; /* Deploy payload on a Lat / Lon / Alt position. This includes the navigation to reach the required release position and velocity. |Operation mode. 0: prepare single payload deploy (overwriting previous requests), but do not execute it. 1: execute payload deploy immediately (rejecting further deploy commands during execution, but allowing abort). 2: add payload deploy to existing deployment list.| Desired approach vector in compass heading. A negative value indicates the system can define the approach vector at will.| Desired ground speed at release time. This can be overridden by the airframe in case it needs to meet minimum airspeed. A negative value indicates the system can define the ground speed at will.| Minimum altitude clearance to the release position. A negative value indicates the system can define the clearance at will.| Latitude unscaled for MISSION_ITEM or in 1e7 degrees for MISSION_ITEM_INT| Longitude unscaled for MISSION_ITEM or in 1e7 degrees for MISSION_ITEM_INT| Altitude (MSL), in meters| */ - public static final int MAV_CMD_PAYLOAD_CONTROL_DEPLOY = 30002; /* Control the payload deployment. |Operation mode. 0: Abort deployment, continue normal mission. 1: switch to payload deployment mode. 100: delete first payload deployment request. 101: delete all payload deployment requests.| Reserved| Reserved| Reserved| Reserved| Reserved| Reserved| */ - public static final int MAV_CMD_WAYPOINT_USER_1 = 31000; /* User defined waypoint item. Ground Station will show the Vehicle as flying through this item. |User defined| User defined| User defined| User defined| Latitude unscaled| Longitude unscaled| Altitude (MSL), in meters| */ - public static final int MAV_CMD_WAYPOINT_USER_2 = 31001; /* User defined waypoint item. Ground Station will show the Vehicle as flying through this item. |User defined| User defined| User defined| User defined| Latitude unscaled| Longitude unscaled| Altitude (MSL), in meters| */ - public static final int MAV_CMD_WAYPOINT_USER_3 = 31002; /* User defined waypoint item. Ground Station will show the Vehicle as flying through this item. |User defined| User defined| User defined| User defined| Latitude unscaled| Longitude unscaled| Altitude (MSL), in meters| */ - public static final int MAV_CMD_WAYPOINT_USER_4 = 31003; /* User defined waypoint item. Ground Station will show the Vehicle as flying through this item. |User defined| User defined| User defined| User defined| Latitude unscaled| Longitude unscaled| Altitude (MSL), in meters| */ - public static final int MAV_CMD_WAYPOINT_USER_5 = 31004; /* User defined waypoint item. Ground Station will show the Vehicle as flying through this item. |User defined| User defined| User defined| User defined| Latitude unscaled| Longitude unscaled| Altitude (MSL), in meters| */ - public static final int MAV_CMD_SPATIAL_USER_1 = 31005; /* User defined spatial item. Ground Station will not show the Vehicle as flying through this item. Example: ROI item. |User defined| User defined| User defined| User defined| Latitude unscaled| Longitude unscaled| Altitude (MSL), in meters| */ - public static final int MAV_CMD_SPATIAL_USER_2 = 31006; /* User defined spatial item. Ground Station will not show the Vehicle as flying through this item. Example: ROI item. |User defined| User defined| User defined| User defined| Latitude unscaled| Longitude unscaled| Altitude (MSL), in meters| */ - public static final int MAV_CMD_SPATIAL_USER_3 = 31007; /* User defined spatial item. Ground Station will not show the Vehicle as flying through this item. Example: ROI item. |User defined| User defined| User defined| User defined| Latitude unscaled| Longitude unscaled| Altitude (MSL), in meters| */ - public static final int MAV_CMD_SPATIAL_USER_4 = 31008; /* User defined spatial item. Ground Station will not show the Vehicle as flying through this item. Example: ROI item. |User defined| User defined| User defined| User defined| Latitude unscaled| Longitude unscaled| Altitude (MSL), in meters| */ - public static final int MAV_CMD_SPATIAL_USER_5 = 31009; /* User defined spatial item. Ground Station will not show the Vehicle as flying through this item. Example: ROI item. |User defined| User defined| User defined| User defined| Latitude unscaled| Longitude unscaled| Altitude (MSL), in meters| */ - public static final int MAV_CMD_USER_1 = 31010; /* User defined command. Ground Station will not show the Vehicle as flying through this item. Example: MAV_CMD_DO_SET_PARAMETER item. |User defined| User defined| User defined| User defined| User defined| User defined| User defined| */ - public static final int MAV_CMD_USER_2 = 31011; /* User defined command. Ground Station will not show the Vehicle as flying through this item. Example: MAV_CMD_DO_SET_PARAMETER item. |User defined| User defined| User defined| User defined| User defined| User defined| User defined| */ - public static final int MAV_CMD_USER_3 = 31012; /* User defined command. Ground Station will not show the Vehicle as flying through this item. Example: MAV_CMD_DO_SET_PARAMETER item. |User defined| User defined| User defined| User defined| User defined| User defined| User defined| */ - public static final int MAV_CMD_USER_4 = 31013; /* User defined command. Ground Station will not show the Vehicle as flying through this item. Example: MAV_CMD_DO_SET_PARAMETER item. |User defined| User defined| User defined| User defined| User defined| User defined| User defined| */ - public static final int MAV_CMD_USER_5 = 31014; /* User defined command. Ground Station will not show the Vehicle as flying through this item. Example: MAV_CMD_DO_SET_PARAMETER item. |User defined| User defined| User defined| User defined| User defined| User defined| User defined| */ - public static final int MAV_CMD_POWER_OFF_INITIATED = 42000; /* A system wide power-off event has been initiated. |Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ - public static final int MAV_CMD_SOLO_BTN_FLY_CLICK = 42001; /* FLY button has been clicked. |Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ - public static final int MAV_CMD_SOLO_BTN_FLY_HOLD = 42002; /* FLY button has been held for 1.5 seconds. |Takeoff altitude.| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ - public static final int MAV_CMD_SOLO_BTN_PAUSE_CLICK = 42003; /* PAUSE button has been clicked. |1 if Solo is in a shot mode, 0 otherwise.| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ - public static final int MAV_CMD_FIXED_MAG_CAL = 42004; /* Magnetometer calibration based on fixed position + public static final int MAV_CMD_UAVCAN_GET_NODE_INFO = 5200; /* Commands the vehicle to respond with a sequence of messages UAVCAN_NODE_INFO, one message per every UAVCAN node that is online. Note that some of the response messages can be lost, which the receiver can detect easily by checking whether every received UAVCAN_NODE_STATUS has a matching message UAVCAN_NODE_INFO received earlier; if not, this command should be sent again in order to request re-transmission of the node information messages. |Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| Reserved (set to 0)| */ + public static final int MAV_CMD_PAYLOAD_PREPARE_DEPLOY = 30001; /* Deploy payload on a Lat / Lon / Alt position. This includes the navigation to reach the required release position and velocity. |Operation mode. 0: prepare single payload deploy (overwriting previous requests), but do not execute it. 1: execute payload deploy immediately (rejecting further deploy commands during execution, but allowing abort). 2: add payload deploy to existing deployment list.| Desired approach vector in compass heading. A negative value indicates the system can define the approach vector at will.| Desired ground speed at release time. This can be overridden by the airframe in case it needs to meet minimum airspeed. A negative value indicates the system can define the ground speed at will.| Minimum altitude clearance to the release position. A negative value indicates the system can define the clearance at will.| Latitude unscaled for MISSION_ITEM or in 1e7 degrees for MISSION_ITEM_INT| Longitude unscaled for MISSION_ITEM or in 1e7 degrees for MISSION_ITEM_INT| Altitude (MSL), in meters| */ + public static final int MAV_CMD_PAYLOAD_CONTROL_DEPLOY = 30002; /* Control the payload deployment. |Operation mode. 0: Abort deployment, continue normal mission. 1: switch to payload deployment mode. 100: delete first payload deployment request. 101: delete all payload deployment requests.| Reserved| Reserved| Reserved| Reserved| Reserved| Reserved| */ + public static final int MAV_CMD_WAYPOINT_USER_1 = 31000; /* User defined waypoint item. Ground Station will show the Vehicle as flying through this item. |User defined| User defined| User defined| User defined| Latitude unscaled| Longitude unscaled| Altitude (MSL), in meters| */ + public static final int MAV_CMD_WAYPOINT_USER_2 = 31001; /* User defined waypoint item. Ground Station will show the Vehicle as flying through this item. |User defined| User defined| User defined| User defined| Latitude unscaled| Longitude unscaled| Altitude (MSL), in meters| */ + public static final int MAV_CMD_WAYPOINT_USER_3 = 31002; /* User defined waypoint item. Ground Station will show the Vehicle as flying through this item. |User defined| User defined| User defined| User defined| Latitude unscaled| Longitude unscaled| Altitude (MSL), in meters| */ + public static final int MAV_CMD_WAYPOINT_USER_4 = 31003; /* User defined waypoint item. Ground Station will show the Vehicle as flying through this item. |User defined| User defined| User defined| User defined| Latitude unscaled| Longitude unscaled| Altitude (MSL), in meters| */ + public static final int MAV_CMD_WAYPOINT_USER_5 = 31004; /* User defined waypoint item. Ground Station will show the Vehicle as flying through this item. |User defined| User defined| User defined| User defined| Latitude unscaled| Longitude unscaled| Altitude (MSL), in meters| */ + public static final int MAV_CMD_SPATIAL_USER_1 = 31005; /* User defined spatial item. Ground Station will not show the Vehicle as flying through this item. Example: ROI item. |User defined| User defined| User defined| User defined| Latitude unscaled| Longitude unscaled| Altitude (MSL), in meters| */ + public static final int MAV_CMD_SPATIAL_USER_2 = 31006; /* User defined spatial item. Ground Station will not show the Vehicle as flying through this item. Example: ROI item. |User defined| User defined| User defined| User defined| Latitude unscaled| Longitude unscaled| Altitude (MSL), in meters| */ + public static final int MAV_CMD_SPATIAL_USER_3 = 31007; /* User defined spatial item. Ground Station will not show the Vehicle as flying through this item. Example: ROI item. |User defined| User defined| User defined| User defined| Latitude unscaled| Longitude unscaled| Altitude (MSL), in meters| */ + public static final int MAV_CMD_SPATIAL_USER_4 = 31008; /* User defined spatial item. Ground Station will not show the Vehicle as flying through this item. Example: ROI item. |User defined| User defined| User defined| User defined| Latitude unscaled| Longitude unscaled| Altitude (MSL), in meters| */ + public static final int MAV_CMD_SPATIAL_USER_5 = 31009; /* User defined spatial item. Ground Station will not show the Vehicle as flying through this item. Example: ROI item. |User defined| User defined| User defined| User defined| Latitude unscaled| Longitude unscaled| Altitude (MSL), in meters| */ + public static final int MAV_CMD_USER_1 = 31010; /* User defined command. Ground Station will not show the Vehicle as flying through this item. Example: MAV_CMD_DO_SET_PARAMETER item. |User defined| User defined| User defined| User defined| User defined| User defined| User defined| */ + public static final int MAV_CMD_USER_2 = 31011; /* User defined command. Ground Station will not show the Vehicle as flying through this item. Example: MAV_CMD_DO_SET_PARAMETER item. |User defined| User defined| User defined| User defined| User defined| User defined| User defined| */ + public static final int MAV_CMD_USER_3 = 31012; /* User defined command. Ground Station will not show the Vehicle as flying through this item. Example: MAV_CMD_DO_SET_PARAMETER item. |User defined| User defined| User defined| User defined| User defined| User defined| User defined| */ + public static final int MAV_CMD_USER_4 = 31013; /* User defined command. Ground Station will not show the Vehicle as flying through this item. Example: MAV_CMD_DO_SET_PARAMETER item. |User defined| User defined| User defined| User defined| User defined| User defined| User defined| */ + public static final int MAV_CMD_USER_5 = 31014; /* User defined command. Ground Station will not show the Vehicle as flying through this item. Example: MAV_CMD_DO_SET_PARAMETER item. |User defined| User defined| User defined| User defined| User defined| User defined| User defined| */ + public static final int MAV_CMD_POWER_OFF_INITIATED = 42000; /* A system wide power-off event has been initiated. |Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ + public static final int MAV_CMD_SOLO_BTN_FLY_CLICK = 42001; /* FLY button has been clicked. |Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ + public static final int MAV_CMD_SOLO_BTN_FLY_HOLD = 42002; /* FLY button has been held for 1.5 seconds. |Takeoff altitude.| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ + public static final int MAV_CMD_SOLO_BTN_PAUSE_CLICK = 42003; /* PAUSE button has been clicked. |1 if Solo is in a shot mode, 0 otherwise.| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ + public static final int MAV_CMD_FIXED_MAG_CAL = 42004; /* Magnetometer calibration based on fixed position in earth field given by inclination, declination and intensity. |MagDeclinationDegrees.| MagInclinationDegrees.| MagIntensityMilliGauss.| YawDegrees.| Empty.| Empty.| Empty.| */ - public static final int MAV_CMD_FIXED_MAG_CAL_FIELD = 42005; /* Magnetometer calibration based on fixed expected field values in milliGauss. |FieldX.| FieldY.| FieldZ.| Empty.| Empty.| Empty.| Empty.| */ - public static final int MAV_CMD_FIXED_MAG_CAL_YAW = 42006; /* Magnetometer calibration based on provided known yaw. This allows for fast calibration using WMM field tables in the vehicle, given only the known yaw of the vehicle. If Latitude and longitude are both zero then use the current vehicle location. |Yaw of vehicle in earth frame.| CompassMask, 0 for all.| Latitude.| Longitude.| Empty.| Empty.| Empty.| */ - public static final int MAV_CMD_DO_START_MAG_CAL = 42424; /* Initiate a magnetometer calibration. |uint8_t bitmask of magnetometers (0 means all).| Automatically retry on failure (0=no retry, 1=retry).| Save without user input (0=require input, 1=autosave).| Delay (seconds).| Autoreboot (0=user reboot, 1=autoreboot).| Empty.| Empty.| */ - public static final int MAV_CMD_DO_ACCEPT_MAG_CAL = 42425; /* Initiate a magnetometer calibration. |uint8_t bitmask of magnetometers (0 means all).| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ - public static final int MAV_CMD_DO_CANCEL_MAG_CAL = 42426; /* Cancel a running magnetometer calibration. |uint8_t bitmask of magnetometers (0 means all).| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ - public static final int MAV_CMD_SET_FACTORY_TEST_MODE = 42427; /* Command autopilot to get into factory test/diagnostic mode. |0 means get out of test mode, 1 means get into test mode.| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ - public static final int MAV_CMD_DO_SEND_BANNER = 42428; /* Reply with the version banner. |Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ - public static final int MAV_CMD_ACCELCAL_VEHICLE_POS = 42429; /* Used when doing accelerometer calibration. When sent to the GCS tells it what position to put the vehicle in. When sent to the vehicle says what position the vehicle is in. |Position, one of the ACCELCAL_VEHICLE_POS enum values.| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ - public static final int MAV_CMD_GIMBAL_RESET = 42501; /* Causes the gimbal to reset and boot as if it was just powered on. |Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ - public static final int MAV_CMD_GIMBAL_AXIS_CALIBRATION_STATUS = 42502; /* Reports progress and success or failure of gimbal axis calibration procedure. |Gimbal axis we're reporting calibration progress for.| Current calibration progress for this axis, 0x64=100%.| Status of the calibration.| Empty.| Empty.| Empty.| Empty.| */ - public static final int MAV_CMD_GIMBAL_REQUEST_AXIS_CALIBRATION = 42503; /* Starts commutation calibration on the gimbal. |Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ - public static final int MAV_CMD_GIMBAL_FULL_RESET = 42505; /* Erases gimbal application and parameters. |Magic number.| Magic number.| Magic number.| Magic number.| Magic number.| Magic number.| Magic number.| */ - public static final int MAV_CMD_DO_WINCH = 42600; /* Command to operate winch. |Winch number (0 for the default winch, otherwise a number from 1 to max number of winches on the vehicle).| Action (0=relax, 1=relative length control, 2=rate control. See WINCH_ACTIONS enum.).| Release length (cable distance to unwind in meters, negative numbers to wind in cable).| Release rate (meters/second).| Empty.| Empty.| Empty.| */ - public static final int MAV_CMD_FLASH_BOOTLOADER = 42650; /* Update the bootloader |Empty| Empty| Empty| Empty| Magic number - set to 290876 to actually flash| Empty| Empty| */ - public static final int MAV_CMD_BATTERY_RESET = 42651; /* Reset battery capacity for batteries that accumulate consumed battery via integration. |Bitmask of batteries to reset. Least significant bit is for the first battery.| Battery percentage remaining to set.| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_ENUM_END = 42652; /* | */ + public static final int MAV_CMD_FIXED_MAG_CAL_FIELD = 42005; /* Magnetometer calibration based on fixed expected field values in milliGauss. |FieldX.| FieldY.| FieldZ.| Empty.| Empty.| Empty.| Empty.| */ + public static final int MAV_CMD_FIXED_MAG_CAL_YAW = 42006; /* Magnetometer calibration based on provided known yaw. This allows for fast calibration using WMM field tables in the vehicle, given only the known yaw of the vehicle. If Latitude and longitude are both zero then use the current vehicle location. |Yaw of vehicle in earth frame.| CompassMask, 0 for all.| Latitude.| Longitude.| Empty.| Empty.| Empty.| */ + public static final int MAV_CMD_DO_START_MAG_CAL = 42424; /* Initiate a magnetometer calibration. |uint8_t bitmask of magnetometers (0 means all).| Automatically retry on failure (0=no retry, 1=retry).| Save without user input (0=require input, 1=autosave).| Delay (seconds).| Autoreboot (0=user reboot, 1=autoreboot).| Empty.| Empty.| */ + public static final int MAV_CMD_DO_ACCEPT_MAG_CAL = 42425; /* Initiate a magnetometer calibration. |uint8_t bitmask of magnetometers (0 means all).| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ + public static final int MAV_CMD_DO_CANCEL_MAG_CAL = 42426; /* Cancel a running magnetometer calibration. |uint8_t bitmask of magnetometers (0 means all).| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ + public static final int MAV_CMD_SET_FACTORY_TEST_MODE = 42427; /* Command autopilot to get into factory test/diagnostic mode. |0 means get out of test mode, 1 means get into test mode.| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ + public static final int MAV_CMD_DO_SEND_BANNER = 42428; /* Reply with the version banner. |Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ + public static final int MAV_CMD_ACCELCAL_VEHICLE_POS = 42429; /* Used when doing accelerometer calibration. When sent to the GCS tells it what position to put the vehicle in. When sent to the vehicle says what position the vehicle is in. |Position, one of the ACCELCAL_VEHICLE_POS enum values.| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ + public static final int MAV_CMD_GIMBAL_RESET = 42501; /* Causes the gimbal to reset and boot as if it was just powered on. |Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ + public static final int MAV_CMD_GIMBAL_AXIS_CALIBRATION_STATUS = 42502; /* Reports progress and success or failure of gimbal axis calibration procedure. |Gimbal axis we're reporting calibration progress for.| Current calibration progress for this axis, 0x64=100%.| Status of the calibration.| Empty.| Empty.| Empty.| Empty.| */ + public static final int MAV_CMD_GIMBAL_REQUEST_AXIS_CALIBRATION = 42503; /* Starts commutation calibration on the gimbal. |Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| Empty.| */ + public static final int MAV_CMD_GIMBAL_FULL_RESET = 42505; /* Erases gimbal application and parameters. |Magic number.| Magic number.| Magic number.| Magic number.| Magic number.| Magic number.| Magic number.| */ + public static final int MAV_CMD_DO_WINCH = 42600; /* Command to operate winch. |Winch number (0 for the default winch, otherwise a number from 1 to max number of winches on the vehicle).| Action (0=relax, 1=relative length control, 2=rate control. See WINCH_ACTIONS enum.).| Release length (cable distance to unwind in meters, negative numbers to wind in cable).| Release rate (meters/second).| Empty.| Empty.| Empty.| */ + public static final int MAV_CMD_FLASH_BOOTLOADER = 42650; /* Update the bootloader |Empty| Empty| Empty| Empty| Magic number - set to 290876 to actually flash| Empty| Empty| */ + public static final int MAV_CMD_BATTERY_RESET = 42651; /* Reset battery capacity for batteries that accumulate consumed battery via integration. |Bitmask of batteries to reset. Least significant bit is for the first battery.| Battery percentage remaining to set.| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_ENUM_END = 42652; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_CMD_ACK.java b/app/src/main/java/com/MAVLink/enums/MAV_CMD_ACK.java index 40f3383..10d3a98 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_CMD_ACK.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_CMD_ACK.java @@ -6,19 +6,19 @@ package com.MAVLink.enums; -/** -* ACK / NACK / ERROR values as a result of MAV_CMDs and for mission item transmission. -*/ +/** + * ACK / NACK / ERROR values as a result of MAV_CMDs and for mission item transmission. + */ public class MAV_CMD_ACK { - public static final int MAV_CMD_ACK_OK = 1; /* Command / mission item is ok. |Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_ACK_ERR_FAIL = 2; /* Generic error message if none of the other reasons fails or if no detailed error reporting is implemented. |Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_ACK_ERR_ACCESS_DENIED = 3; /* The system is refusing to accept this command from this source / communication partner. |Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_ACK_ERR_NOT_SUPPORTED = 4; /* Command or mission item is not supported, other commands would be accepted. |Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_ACK_ERR_COORDINATE_FRAME_NOT_SUPPORTED = 5; /* The coordinate frame of this command / mission item is not supported. |Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_ACK_ERR_COORDINATES_OUT_OF_RANGE = 6; /* The coordinate frame of this command is ok, but he coordinate values exceed the safety limits of this system. This is a generic error, please use the more specific error messages below if possible. |Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_ACK_ERR_X_LAT_OUT_OF_RANGE = 7; /* The X or latitude value is out of range. |Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_ACK_ERR_Y_LON_OUT_OF_RANGE = 8; /* The Y or longitude value is out of range. |Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_ACK_ERR_Z_ALT_OUT_OF_RANGE = 9; /* The Z or altitude value is out of range. |Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ - public static final int MAV_CMD_ACK_ENUM_END = 10; /* | */ + public static final int MAV_CMD_ACK_OK = 1; /* Command / mission item is ok. |Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_ACK_ERR_FAIL = 2; /* Generic error message if none of the other reasons fails or if no detailed error reporting is implemented. |Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_ACK_ERR_ACCESS_DENIED = 3; /* The system is refusing to accept this command from this source / communication partner. |Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_ACK_ERR_NOT_SUPPORTED = 4; /* Command or mission item is not supported, other commands would be accepted. |Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_ACK_ERR_COORDINATE_FRAME_NOT_SUPPORTED = 5; /* The coordinate frame of this command / mission item is not supported. |Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_ACK_ERR_COORDINATES_OUT_OF_RANGE = 6; /* The coordinate frame of this command is ok, but he coordinate values exceed the safety limits of this system. This is a generic error, please use the more specific error messages below if possible. |Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_ACK_ERR_X_LAT_OUT_OF_RANGE = 7; /* The X or latitude value is out of range. |Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_ACK_ERR_Y_LON_OUT_OF_RANGE = 8; /* The Y or longitude value is out of range. |Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_ACK_ERR_Z_ALT_OUT_OF_RANGE = 9; /* The Z or altitude value is out of range. |Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| Reserved (default:0)| */ + public static final int MAV_CMD_ACK_ENUM_END = 10; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_COLLISION_ACTION.java b/app/src/main/java/com/MAVLink/enums/MAV_COLLISION_ACTION.java index 988daf3..3bbfcbe 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_COLLISION_ACTION.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_COLLISION_ACTION.java @@ -6,17 +6,17 @@ package com.MAVLink.enums; -/** -* Possible actions an aircraft can take to avoid a collision. -*/ +/** + * Possible actions an aircraft can take to avoid a collision. + */ public class MAV_COLLISION_ACTION { - public static final int MAV_COLLISION_ACTION_NONE = 0; /* Ignore any potential collisions | */ - public static final int MAV_COLLISION_ACTION_REPORT = 1; /* Report potential collision | */ - public static final int MAV_COLLISION_ACTION_ASCEND_OR_DESCEND = 2; /* Ascend or Descend to avoid threat | */ - public static final int MAV_COLLISION_ACTION_MOVE_HORIZONTALLY = 3; /* Move horizontally to avoid threat | */ - public static final int MAV_COLLISION_ACTION_MOVE_PERPENDICULAR = 4; /* Aircraft to move perpendicular to the collision's velocity vector | */ - public static final int MAV_COLLISION_ACTION_RTL = 5; /* Aircraft to fly directly back to its launch point | */ - public static final int MAV_COLLISION_ACTION_HOVER = 6; /* Aircraft to stop in place | */ - public static final int MAV_COLLISION_ACTION_ENUM_END = 7; /* | */ + public static final int MAV_COLLISION_ACTION_NONE = 0; /* Ignore any potential collisions | */ + public static final int MAV_COLLISION_ACTION_REPORT = 1; /* Report potential collision | */ + public static final int MAV_COLLISION_ACTION_ASCEND_OR_DESCEND = 2; /* Ascend or Descend to avoid threat | */ + public static final int MAV_COLLISION_ACTION_MOVE_HORIZONTALLY = 3; /* Move horizontally to avoid threat | */ + public static final int MAV_COLLISION_ACTION_MOVE_PERPENDICULAR = 4; /* Aircraft to move perpendicular to the collision's velocity vector | */ + public static final int MAV_COLLISION_ACTION_RTL = 5; /* Aircraft to fly directly back to its launch point | */ + public static final int MAV_COLLISION_ACTION_HOVER = 6; /* Aircraft to stop in place | */ + public static final int MAV_COLLISION_ACTION_ENUM_END = 7; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_COLLISION_SRC.java b/app/src/main/java/com/MAVLink/enums/MAV_COLLISION_SRC.java index b2fd278..16fb78c 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_COLLISION_SRC.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_COLLISION_SRC.java @@ -6,12 +6,12 @@ package com.MAVLink.enums; -/** -* Source of information about this collision. -*/ +/** + * Source of information about this collision. + */ public class MAV_COLLISION_SRC { - public static final int MAV_COLLISION_SRC_ADSB = 0; /* ID field references ADSB_VEHICLE packets | */ - public static final int MAV_COLLISION_SRC_MAVLINK_GPS_GLOBAL_INT = 1; /* ID field references MAVLink SRC ID | */ - public static final int MAV_COLLISION_SRC_ENUM_END = 2; /* | */ + public static final int MAV_COLLISION_SRC_ADSB = 0; /* ID field references ADSB_VEHICLE packets | */ + public static final int MAV_COLLISION_SRC_MAVLINK_GPS_GLOBAL_INT = 1; /* ID field references MAVLink SRC ID | */ + public static final int MAV_COLLISION_SRC_ENUM_END = 2; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_COLLISION_THREAT_LEVEL.java b/app/src/main/java/com/MAVLink/enums/MAV_COLLISION_THREAT_LEVEL.java index ba4a984..263b3e4 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_COLLISION_THREAT_LEVEL.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_COLLISION_THREAT_LEVEL.java @@ -6,13 +6,13 @@ package com.MAVLink.enums; -/** -* Aircraft-rated danger from this threat. -*/ +/** + * Aircraft-rated danger from this threat. + */ public class MAV_COLLISION_THREAT_LEVEL { - public static final int MAV_COLLISION_THREAT_LEVEL_NONE = 0; /* Not a threat | */ - public static final int MAV_COLLISION_THREAT_LEVEL_LOW = 1; /* Craft is mildly concerned about this threat | */ - public static final int MAV_COLLISION_THREAT_LEVEL_HIGH = 2; /* Craft is panicking, and may take actions to avoid threat | */ - public static final int MAV_COLLISION_THREAT_LEVEL_ENUM_END = 3; /* | */ + public static final int MAV_COLLISION_THREAT_LEVEL_NONE = 0; /* Not a threat | */ + public static final int MAV_COLLISION_THREAT_LEVEL_LOW = 1; /* Craft is mildly concerned about this threat | */ + public static final int MAV_COLLISION_THREAT_LEVEL_HIGH = 2; /* Craft is panicking, and may take actions to avoid threat | */ + public static final int MAV_COLLISION_THREAT_LEVEL_ENUM_END = 3; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_COMPONENT.java b/app/src/main/java/com/MAVLink/enums/MAV_COMPONENT.java index 2e38d40..42be205 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_COMPONENT.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_COMPONENT.java @@ -6,135 +6,135 @@ package com.MAVLink.enums; -/** -* Component ids (values) for the different types and instances of onboard hardware/software that might make up a MAVLink system (autopilot, cameras, servos, GPS systems, avoidance systems etc.). - Components must use the appropriate ID in their source address when sending messages. Components can also use IDs to determine if they are the intended recipient of an incoming message. The MAV_COMP_ID_ALL value is used to indicate messages that must be processed by all components. - When creating new entries, components that can have multiple instances (e.g. cameras, servos etc.) should be allocated sequential values. An appropriate number of values should be left free after these components to allow the number of instances to be expanded. -*/ +/** + * Component ids (values) for the different types and instances of onboard hardware/software that might make up a MAVLink system (autopilot, cameras, servos, GPS systems, avoidance systems etc.). + * Components must use the appropriate ID in their source address when sending messages. Components can also use IDs to determine if they are the intended recipient of an incoming message. The MAV_COMP_ID_ALL value is used to indicate messages that must be processed by all components. + * When creating new entries, components that can have multiple instances (e.g. cameras, servos etc.) should be allocated sequential values. An appropriate number of values should be left free after these components to allow the number of instances to be expanded. + */ public class MAV_COMPONENT { - public static final int MAV_COMP_ID_ALL = 0; /* Target id (target_component) used to broadcast messages to all components of the receiving system. Components should attempt to process messages with this component ID and forward to components on any other interfaces. Note: This is not a valid *source* component id for a message. | */ - public static final int MAV_COMP_ID_AUTOPILOT1 = 1; /* System flight controller component ("autopilot"). Only one autopilot is expected in a particular system. | */ - public static final int MAV_COMP_ID_USER1 = 25; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER2 = 26; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER3 = 27; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER4 = 28; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER5 = 29; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER6 = 30; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER7 = 31; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER8 = 32; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER9 = 33; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER10 = 34; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER11 = 35; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER12 = 36; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER13 = 37; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER14 = 38; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER15 = 39; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USE16 = 40; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER17 = 41; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER18 = 42; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER19 = 43; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER20 = 44; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER21 = 45; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER22 = 46; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER23 = 47; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER24 = 48; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER25 = 49; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER26 = 50; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER27 = 51; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER28 = 52; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER29 = 53; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER30 = 54; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER31 = 55; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER32 = 56; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER33 = 57; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER34 = 58; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER35 = 59; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER36 = 60; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER37 = 61; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER38 = 62; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER39 = 63; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER40 = 64; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER41 = 65; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER42 = 66; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER43 = 67; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER44 = 68; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER45 = 69; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER46 = 70; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER47 = 71; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER48 = 72; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER49 = 73; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER50 = 74; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER51 = 75; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER52 = 76; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER53 = 77; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER54 = 78; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER55 = 79; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER56 = 80; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER57 = 81; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER58 = 82; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER59 = 83; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER60 = 84; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER61 = 85; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER62 = 86; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER63 = 87; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER64 = 88; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER65 = 89; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER66 = 90; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER67 = 91; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER68 = 92; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER69 = 93; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER70 = 94; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER71 = 95; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER72 = 96; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER73 = 97; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER74 = 98; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_USER75 = 99; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ - public static final int MAV_COMP_ID_CAMERA = 100; /* Camera #1. | */ - public static final int MAV_COMP_ID_CAMERA2 = 101; /* Camera #2. | */ - public static final int MAV_COMP_ID_CAMERA3 = 102; /* Camera #3. | */ - public static final int MAV_COMP_ID_CAMERA4 = 103; /* Camera #4. | */ - public static final int MAV_COMP_ID_CAMERA5 = 104; /* Camera #5. | */ - public static final int MAV_COMP_ID_CAMERA6 = 105; /* Camera #6. | */ - public static final int MAV_COMP_ID_SERVO1 = 140; /* Servo #1. | */ - public static final int MAV_COMP_ID_SERVO2 = 141; /* Servo #2. | */ - public static final int MAV_COMP_ID_SERVO3 = 142; /* Servo #3. | */ - public static final int MAV_COMP_ID_SERVO4 = 143; /* Servo #4. | */ - public static final int MAV_COMP_ID_SERVO5 = 144; /* Servo #5. | */ - public static final int MAV_COMP_ID_SERVO6 = 145; /* Servo #6. | */ - public static final int MAV_COMP_ID_SERVO7 = 146; /* Servo #7. | */ - public static final int MAV_COMP_ID_SERVO8 = 147; /* Servo #8. | */ - public static final int MAV_COMP_ID_SERVO9 = 148; /* Servo #9. | */ - public static final int MAV_COMP_ID_SERVO10 = 149; /* Servo #10. | */ - public static final int MAV_COMP_ID_SERVO11 = 150; /* Servo #11. | */ - public static final int MAV_COMP_ID_SERVO12 = 151; /* Servo #12. | */ - public static final int MAV_COMP_ID_SERVO13 = 152; /* Servo #13. | */ - public static final int MAV_COMP_ID_SERVO14 = 153; /* Servo #14. | */ - public static final int MAV_COMP_ID_GIMBAL = 154; /* Gimbal #1. | */ - public static final int MAV_COMP_ID_LOG = 155; /* Logging component. | */ - public static final int MAV_COMP_ID_ADSB = 156; /* Automatic Dependent Surveillance-Broadcast (ADS-B) component. | */ - public static final int MAV_COMP_ID_OSD = 157; /* On Screen Display (OSD) devices for video links. | */ - public static final int MAV_COMP_ID_PERIPHERAL = 158; /* Generic autopilot peripheral component ID. Meant for devices that do not implement the parameter microservice. | */ - public static final int MAV_COMP_ID_QX1_GIMBAL = 159; /* Gimbal ID for QX1. | */ - public static final int MAV_COMP_ID_FLARM = 160; /* FLARM collision alert component. | */ - public static final int MAV_COMP_ID_GIMBAL2 = 171; /* Gimbal #2. | */ - public static final int MAV_COMP_ID_GIMBAL3 = 172; /* Gimbal #3. | */ - public static final int MAV_COMP_ID_GIMBAL4 = 173; /* Gimbal #4 | */ - public static final int MAV_COMP_ID_GIMBAL5 = 174; /* Gimbal #5. | */ - public static final int MAV_COMP_ID_GIMBAL6 = 175; /* Gimbal #6. | */ - public static final int MAV_COMP_ID_MISSIONPLANNER = 190; /* Component that can generate/supply a mission flight plan (e.g. GCS or developer API). | */ - public static final int MAV_COMP_ID_PATHPLANNER = 195; /* Component that finds an optimal path between points based on a certain constraint (e.g. minimum snap, shortest path, cost, etc.). | */ - public static final int MAV_COMP_ID_OBSTACLE_AVOIDANCE = 196; /* Component that plans a collision free path between two points. | */ - public static final int MAV_COMP_ID_VISUAL_INERTIAL_ODOMETRY = 197; /* Component that provides position estimates using VIO techniques. | */ - public static final int MAV_COMP_ID_PAIRING_MANAGER = 198; /* Component that manages pairing of vehicle and GCS. | */ - public static final int MAV_COMP_ID_IMU = 200; /* Inertial Measurement Unit (IMU) #1. | */ - public static final int MAV_COMP_ID_IMU_2 = 201; /* Inertial Measurement Unit (IMU) #2. | */ - public static final int MAV_COMP_ID_IMU_3 = 202; /* Inertial Measurement Unit (IMU) #3. | */ - public static final int MAV_COMP_ID_GPS = 220; /* GPS #1. | */ - public static final int MAV_COMP_ID_GPS2 = 221; /* GPS #2. | */ - public static final int MAV_COMP_ID_UDP_BRIDGE = 240; /* Component to bridge MAVLink to UDP (i.e. from a UART). | */ - public static final int MAV_COMP_ID_UART_BRIDGE = 241; /* Component to bridge to UART (i.e. from UDP). | */ - public static final int MAV_COMP_ID_TUNNEL_NODE = 242; /* Component handling TUNNEL messages (e.g. vendor specific GUI of a component). | */ - public static final int MAV_COMP_ID_SYSTEM_CONTROL = 250; /* Component for handling system messages (e.g. to ARM, takeoff, etc.). | */ - public static final int MAV_COMPONENT_ENUM_END = 251; /* | */ + public static final int MAV_COMP_ID_ALL = 0; /* Target id (target_component) used to broadcast messages to all components of the receiving system. Components should attempt to process messages with this component ID and forward to components on any other interfaces. Note: This is not a valid *source* component id for a message. | */ + public static final int MAV_COMP_ID_AUTOPILOT1 = 1; /* System flight controller component ("autopilot"). Only one autopilot is expected in a particular system. | */ + public static final int MAV_COMP_ID_USER1 = 25; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER2 = 26; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER3 = 27; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER4 = 28; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER5 = 29; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER6 = 30; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER7 = 31; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER8 = 32; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER9 = 33; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER10 = 34; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER11 = 35; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER12 = 36; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER13 = 37; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER14 = 38; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER15 = 39; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USE16 = 40; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER17 = 41; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER18 = 42; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER19 = 43; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER20 = 44; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER21 = 45; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER22 = 46; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER23 = 47; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER24 = 48; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER25 = 49; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER26 = 50; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER27 = 51; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER28 = 52; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER29 = 53; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER30 = 54; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER31 = 55; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER32 = 56; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER33 = 57; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER34 = 58; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER35 = 59; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER36 = 60; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER37 = 61; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER38 = 62; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER39 = 63; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER40 = 64; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER41 = 65; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER42 = 66; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER43 = 67; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER44 = 68; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER45 = 69; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER46 = 70; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER47 = 71; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER48 = 72; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER49 = 73; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER50 = 74; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER51 = 75; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER52 = 76; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER53 = 77; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER54 = 78; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER55 = 79; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER56 = 80; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER57 = 81; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER58 = 82; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER59 = 83; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER60 = 84; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER61 = 85; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER62 = 86; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER63 = 87; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER64 = 88; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER65 = 89; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER66 = 90; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER67 = 91; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER68 = 92; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER69 = 93; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER70 = 94; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER71 = 95; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER72 = 96; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER73 = 97; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER74 = 98; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_USER75 = 99; /* Id for a component on privately managed MAVLink network. Can be used for any purpose but may not be published by components outside of the private network. | */ + public static final int MAV_COMP_ID_CAMERA = 100; /* Camera #1. | */ + public static final int MAV_COMP_ID_CAMERA2 = 101; /* Camera #2. | */ + public static final int MAV_COMP_ID_CAMERA3 = 102; /* Camera #3. | */ + public static final int MAV_COMP_ID_CAMERA4 = 103; /* Camera #4. | */ + public static final int MAV_COMP_ID_CAMERA5 = 104; /* Camera #5. | */ + public static final int MAV_COMP_ID_CAMERA6 = 105; /* Camera #6. | */ + public static final int MAV_COMP_ID_SERVO1 = 140; /* Servo #1. | */ + public static final int MAV_COMP_ID_SERVO2 = 141; /* Servo #2. | */ + public static final int MAV_COMP_ID_SERVO3 = 142; /* Servo #3. | */ + public static final int MAV_COMP_ID_SERVO4 = 143; /* Servo #4. | */ + public static final int MAV_COMP_ID_SERVO5 = 144; /* Servo #5. | */ + public static final int MAV_COMP_ID_SERVO6 = 145; /* Servo #6. | */ + public static final int MAV_COMP_ID_SERVO7 = 146; /* Servo #7. | */ + public static final int MAV_COMP_ID_SERVO8 = 147; /* Servo #8. | */ + public static final int MAV_COMP_ID_SERVO9 = 148; /* Servo #9. | */ + public static final int MAV_COMP_ID_SERVO10 = 149; /* Servo #10. | */ + public static final int MAV_COMP_ID_SERVO11 = 150; /* Servo #11. | */ + public static final int MAV_COMP_ID_SERVO12 = 151; /* Servo #12. | */ + public static final int MAV_COMP_ID_SERVO13 = 152; /* Servo #13. | */ + public static final int MAV_COMP_ID_SERVO14 = 153; /* Servo #14. | */ + public static final int MAV_COMP_ID_GIMBAL = 154; /* Gimbal #1. | */ + public static final int MAV_COMP_ID_LOG = 155; /* Logging component. | */ + public static final int MAV_COMP_ID_ADSB = 156; /* Automatic Dependent Surveillance-Broadcast (ADS-B) component. | */ + public static final int MAV_COMP_ID_OSD = 157; /* On Screen Display (OSD) devices for video links. | */ + public static final int MAV_COMP_ID_PERIPHERAL = 158; /* Generic autopilot peripheral component ID. Meant for devices that do not implement the parameter microservice. | */ + public static final int MAV_COMP_ID_QX1_GIMBAL = 159; /* Gimbal ID for QX1. | */ + public static final int MAV_COMP_ID_FLARM = 160; /* FLARM collision alert component. | */ + public static final int MAV_COMP_ID_GIMBAL2 = 171; /* Gimbal #2. | */ + public static final int MAV_COMP_ID_GIMBAL3 = 172; /* Gimbal #3. | */ + public static final int MAV_COMP_ID_GIMBAL4 = 173; /* Gimbal #4 | */ + public static final int MAV_COMP_ID_GIMBAL5 = 174; /* Gimbal #5. | */ + public static final int MAV_COMP_ID_GIMBAL6 = 175; /* Gimbal #6. | */ + public static final int MAV_COMP_ID_MISSIONPLANNER = 190; /* Component that can generate/supply a mission flight plan (e.g. GCS or developer API). | */ + public static final int MAV_COMP_ID_PATHPLANNER = 195; /* Component that finds an optimal path between points based on a certain constraint (e.g. minimum snap, shortest path, cost, etc.). | */ + public static final int MAV_COMP_ID_OBSTACLE_AVOIDANCE = 196; /* Component that plans a collision free path between two points. | */ + public static final int MAV_COMP_ID_VISUAL_INERTIAL_ODOMETRY = 197; /* Component that provides position estimates using VIO techniques. | */ + public static final int MAV_COMP_ID_PAIRING_MANAGER = 198; /* Component that manages pairing of vehicle and GCS. | */ + public static final int MAV_COMP_ID_IMU = 200; /* Inertial Measurement Unit (IMU) #1. | */ + public static final int MAV_COMP_ID_IMU_2 = 201; /* Inertial Measurement Unit (IMU) #2. | */ + public static final int MAV_COMP_ID_IMU_3 = 202; /* Inertial Measurement Unit (IMU) #3. | */ + public static final int MAV_COMP_ID_GPS = 220; /* GPS #1. | */ + public static final int MAV_COMP_ID_GPS2 = 221; /* GPS #2. | */ + public static final int MAV_COMP_ID_UDP_BRIDGE = 240; /* Component to bridge MAVLink to UDP (i.e. from a UART). | */ + public static final int MAV_COMP_ID_UART_BRIDGE = 241; /* Component to bridge to UART (i.e. from UDP). | */ + public static final int MAV_COMP_ID_TUNNEL_NODE = 242; /* Component handling TUNNEL messages (e.g. vendor specific GUI of a component). | */ + public static final int MAV_COMP_ID_SYSTEM_CONTROL = 250; /* Component for handling system messages (e.g. to ARM, takeoff, etc.). | */ + public static final int MAV_COMPONENT_ENUM_END = 251; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_DATA_STREAM.java b/app/src/main/java/com/MAVLink/enums/MAV_DATA_STREAM.java index 4b2b684..5adbfeb 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_DATA_STREAM.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_DATA_STREAM.java @@ -6,21 +6,21 @@ package com.MAVLink.enums; -/** -* A data stream is not a fixed set of messages, but rather a - recommendation to the autopilot software. Individual autopilots may or may not obey - the recommended messages. -*/ +/** + * A data stream is not a fixed set of messages, but rather a + * recommendation to the autopilot software. Individual autopilots may or may not obey + * the recommended messages. + */ public class MAV_DATA_STREAM { - public static final int MAV_DATA_STREAM_ALL = 0; /* Enable all data streams | */ - public static final int MAV_DATA_STREAM_RAW_SENSORS = 1; /* Enable IMU_RAW, GPS_RAW, GPS_STATUS packets. | */ - public static final int MAV_DATA_STREAM_EXTENDED_STATUS = 2; /* Enable GPS_STATUS, CONTROL_STATUS, AUX_STATUS | */ - public static final int MAV_DATA_STREAM_RC_CHANNELS = 3; /* Enable RC_CHANNELS_SCALED, RC_CHANNELS_RAW, SERVO_OUTPUT_RAW | */ - public static final int MAV_DATA_STREAM_RAW_CONTROLLER = 4; /* Enable ATTITUDE_CONTROLLER_OUTPUT, POSITION_CONTROLLER_OUTPUT, NAV_CONTROLLER_OUTPUT. | */ - public static final int MAV_DATA_STREAM_POSITION = 6; /* Enable LOCAL_POSITION, GLOBAL_POSITION/GLOBAL_POSITION_INT messages. | */ - public static final int MAV_DATA_STREAM_EXTRA1 = 10; /* Dependent on the autopilot | */ - public static final int MAV_DATA_STREAM_EXTRA2 = 11; /* Dependent on the autopilot | */ - public static final int MAV_DATA_STREAM_EXTRA3 = 12; /* Dependent on the autopilot | */ - public static final int MAV_DATA_STREAM_ENUM_END = 13; /* | */ + public static final int MAV_DATA_STREAM_ALL = 0; /* Enable all data streams | */ + public static final int MAV_DATA_STREAM_RAW_SENSORS = 1; /* Enable IMU_RAW, GPS_RAW, GPS_STATUS packets. | */ + public static final int MAV_DATA_STREAM_EXTENDED_STATUS = 2; /* Enable GPS_STATUS, CONTROL_STATUS, AUX_STATUS | */ + public static final int MAV_DATA_STREAM_RC_CHANNELS = 3; /* Enable RC_CHANNELS_SCALED, RC_CHANNELS_RAW, SERVO_OUTPUT_RAW | */ + public static final int MAV_DATA_STREAM_RAW_CONTROLLER = 4; /* Enable ATTITUDE_CONTROLLER_OUTPUT, POSITION_CONTROLLER_OUTPUT, NAV_CONTROLLER_OUTPUT. | */ + public static final int MAV_DATA_STREAM_POSITION = 6; /* Enable LOCAL_POSITION, GLOBAL_POSITION/GLOBAL_POSITION_INT messages. | */ + public static final int MAV_DATA_STREAM_EXTRA1 = 10; /* Dependent on the autopilot | */ + public static final int MAV_DATA_STREAM_EXTRA2 = 11; /* Dependent on the autopilot | */ + public static final int MAV_DATA_STREAM_EXTRA3 = 12; /* Dependent on the autopilot | */ + public static final int MAV_DATA_STREAM_ENUM_END = 13; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_DISTANCE_SENSOR.java b/app/src/main/java/com/MAVLink/enums/MAV_DISTANCE_SENSOR.java index a36860b..65d4fad 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_DISTANCE_SENSOR.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_DISTANCE_SENSOR.java @@ -6,15 +6,15 @@ package com.MAVLink.enums; -/** -* Enumeration of distance sensor types -*/ +/** + * Enumeration of distance sensor types + */ public class MAV_DISTANCE_SENSOR { - public static final int MAV_DISTANCE_SENSOR_LASER = 0; /* Laser rangefinder, e.g. LightWare SF02/F or PulsedLight units | */ - public static final int MAV_DISTANCE_SENSOR_ULTRASOUND = 1; /* Ultrasound rangefinder, e.g. MaxBotix units | */ - public static final int MAV_DISTANCE_SENSOR_INFRARED = 2; /* Infrared rangefinder, e.g. Sharp units | */ - public static final int MAV_DISTANCE_SENSOR_RADAR = 3; /* Radar type, e.g. uLanding units | */ - public static final int MAV_DISTANCE_SENSOR_UNKNOWN = 4; /* Broken or unknown type, e.g. analog units | */ - public static final int MAV_DISTANCE_SENSOR_ENUM_END = 5; /* | */ + public static final int MAV_DISTANCE_SENSOR_LASER = 0; /* Laser rangefinder, e.g. LightWare SF02/F or PulsedLight units | */ + public static final int MAV_DISTANCE_SENSOR_ULTRASOUND = 1; /* Ultrasound rangefinder, e.g. MaxBotix units | */ + public static final int MAV_DISTANCE_SENSOR_INFRARED = 2; /* Infrared rangefinder, e.g. Sharp units | */ + public static final int MAV_DISTANCE_SENSOR_RADAR = 3; /* Radar type, e.g. uLanding units | */ + public static final int MAV_DISTANCE_SENSOR_UNKNOWN = 4; /* Broken or unknown type, e.g. analog units | */ + public static final int MAV_DISTANCE_SENSOR_ENUM_END = 5; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_DO_REPOSITION_FLAGS.java b/app/src/main/java/com/MAVLink/enums/MAV_DO_REPOSITION_FLAGS.java index 31c65c7..fc59f18 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_DO_REPOSITION_FLAGS.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_DO_REPOSITION_FLAGS.java @@ -6,11 +6,11 @@ package com.MAVLink.enums; -/** -* Bitmap of options for the MAV_CMD_DO_REPOSITION -*/ +/** + * Bitmap of options for the MAV_CMD_DO_REPOSITION + */ public class MAV_DO_REPOSITION_FLAGS { - public static final int MAV_DO_REPOSITION_FLAGS_CHANGE_MODE = 1; /* The aircraft should immediately transition into guided. This should not be set for follow me applications | */ - public static final int MAV_DO_REPOSITION_FLAGS_ENUM_END = 2; /* | */ + public static final int MAV_DO_REPOSITION_FLAGS_CHANGE_MODE = 1; /* The aircraft should immediately transition into guided. This should not be set for follow me applications | */ + public static final int MAV_DO_REPOSITION_FLAGS_ENUM_END = 2; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_ESTIMATOR_TYPE.java b/app/src/main/java/com/MAVLink/enums/MAV_ESTIMATOR_TYPE.java index 5571a20..5c69f71 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_ESTIMATOR_TYPE.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_ESTIMATOR_TYPE.java @@ -6,19 +6,19 @@ package com.MAVLink.enums; -/** -* Enumeration of estimator types -*/ +/** + * Enumeration of estimator types + */ public class MAV_ESTIMATOR_TYPE { - public static final int MAV_ESTIMATOR_TYPE_UNKNOWN = 0; /* Unknown type of the estimator. | */ - public static final int MAV_ESTIMATOR_TYPE_NAIVE = 1; /* This is a naive estimator without any real covariance feedback. | */ - public static final int MAV_ESTIMATOR_TYPE_VISION = 2; /* Computer vision based estimate. Might be up to scale. | */ - public static final int MAV_ESTIMATOR_TYPE_VIO = 3; /* Visual-inertial estimate. | */ - public static final int MAV_ESTIMATOR_TYPE_GPS = 4; /* Plain GPS estimate. | */ - public static final int MAV_ESTIMATOR_TYPE_GPS_INS = 5; /* Estimator integrating GPS and inertial sensing. | */ - public static final int MAV_ESTIMATOR_TYPE_MOCAP = 6; /* Estimate from external motion capturing system. | */ - public static final int MAV_ESTIMATOR_TYPE_LIDAR = 7; /* Estimator based on lidar sensor input. | */ - public static final int MAV_ESTIMATOR_TYPE_AUTOPILOT = 8; /* Estimator on autopilot. | */ - public static final int MAV_ESTIMATOR_TYPE_ENUM_END = 9; /* | */ + public static final int MAV_ESTIMATOR_TYPE_UNKNOWN = 0; /* Unknown type of the estimator. | */ + public static final int MAV_ESTIMATOR_TYPE_NAIVE = 1; /* This is a naive estimator without any real covariance feedback. | */ + public static final int MAV_ESTIMATOR_TYPE_VISION = 2; /* Computer vision based estimate. Might be up to scale. | */ + public static final int MAV_ESTIMATOR_TYPE_VIO = 3; /* Visual-inertial estimate. | */ + public static final int MAV_ESTIMATOR_TYPE_GPS = 4; /* Plain GPS estimate. | */ + public static final int MAV_ESTIMATOR_TYPE_GPS_INS = 5; /* Estimator integrating GPS and inertial sensing. | */ + public static final int MAV_ESTIMATOR_TYPE_MOCAP = 6; /* Estimate from external motion capturing system. | */ + public static final int MAV_ESTIMATOR_TYPE_LIDAR = 7; /* Estimator based on lidar sensor input. | */ + public static final int MAV_ESTIMATOR_TYPE_AUTOPILOT = 8; /* Estimator on autopilot. | */ + public static final int MAV_ESTIMATOR_TYPE_ENUM_END = 9; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_FRAME.java b/app/src/main/java/com/MAVLink/enums/MAV_FRAME.java index 0c75dd0..4c07dda 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_FRAME.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_FRAME.java @@ -6,32 +6,32 @@ package com.MAVLink.enums; -/** -* -*/ +/** + * + */ public class MAV_FRAME { - public static final int MAV_FRAME_GLOBAL = 0; /* Global (WGS84) coordinate frame + MSL altitude. First value / x: latitude, second value / y: longitude, third value / z: positive altitude over mean sea level (MSL). | */ - public static final int MAV_FRAME_LOCAL_NED = 1; /* Local coordinate frame, Z-down (x: north, y: east, z: down). | */ - public static final int MAV_FRAME_MISSION = 2; /* NOT a coordinate frame, indicates a mission command. | */ - public static final int MAV_FRAME_GLOBAL_RELATIVE_ALT = 3; /* Global (WGS84) coordinate frame + altitude relative to the home position. First value / x: latitude, second value / y: longitude, third value / z: positive altitude with 0 being at the altitude of the home location. | */ - public static final int MAV_FRAME_LOCAL_ENU = 4; /* Local coordinate frame, Z-up (x: east, y: north, z: up). | */ - public static final int MAV_FRAME_GLOBAL_INT = 5; /* Global (WGS84) coordinate frame (scaled) + MSL altitude. First value / x: latitude in degrees*1.0e-7, second value / y: longitude in degrees*1.0e-7, third value / z: positive altitude over mean sea level (MSL). | */ - public static final int MAV_FRAME_GLOBAL_RELATIVE_ALT_INT = 6; /* Global (WGS84) coordinate frame (scaled) + altitude relative to the home position. First value / x: latitude in degrees*10e-7, second value / y: longitude in degrees*10e-7, third value / z: positive altitude with 0 being at the altitude of the home location. | */ - public static final int MAV_FRAME_LOCAL_OFFSET_NED = 7; /* Offset to the current local frame. Anything expressed in this frame should be added to the current local frame position. | */ - public static final int MAV_FRAME_BODY_NED = 8; /* Setpoint in body NED frame. This makes sense if all position control is externalized - e.g. useful to command 2 m/s^2 acceleration to the right. | */ - public static final int MAV_FRAME_BODY_OFFSET_NED = 9; /* Offset in body NED frame. This makes sense if adding setpoints to the current flight path, to avoid an obstacle - e.g. useful to command 2 m/s^2 acceleration to the east. | */ - public static final int MAV_FRAME_GLOBAL_TERRAIN_ALT = 10; /* Global (WGS84) coordinate frame with AGL altitude (at the waypoint coordinate). First value / x: latitude in degrees, second value / y: longitude in degrees, third value / z: positive altitude in meters with 0 being at ground level in terrain model. | */ - public static final int MAV_FRAME_GLOBAL_TERRAIN_ALT_INT = 11; /* Global (WGS84) coordinate frame (scaled) with AGL altitude (at the waypoint coordinate). First value / x: latitude in degrees*10e-7, second value / y: longitude in degrees*10e-7, third value / z: positive altitude in meters with 0 being at ground level in terrain model. | */ - public static final int MAV_FRAME_BODY_FRD = 12; /* Body fixed frame of reference, Z-down (x: forward, y: right, z: down). | */ - public static final int MAV_FRAME_BODY_FLU = 13; /* Body fixed frame of reference, Z-up (x: forward, y: left, z: up). | */ - public static final int MAV_FRAME_MOCAP_NED = 14; /* Odometry local coordinate frame of data given by a motion capture system, Z-down (x: north, y: east, z: down). | */ - public static final int MAV_FRAME_MOCAP_ENU = 15; /* Odometry local coordinate frame of data given by a motion capture system, Z-up (x: east, y: north, z: up). | */ - public static final int MAV_FRAME_VISION_NED = 16; /* Odometry local coordinate frame of data given by a vision estimation system, Z-down (x: north, y: east, z: down). | */ - public static final int MAV_FRAME_VISION_ENU = 17; /* Odometry local coordinate frame of data given by a vision estimation system, Z-up (x: east, y: north, z: up). | */ - public static final int MAV_FRAME_ESTIM_NED = 18; /* Odometry local coordinate frame of data given by an estimator running onboard the vehicle, Z-down (x: north, y: east, z: down). | */ - public static final int MAV_FRAME_ESTIM_ENU = 19; /* Odometry local coordinate frame of data given by an estimator running onboard the vehicle, Z-up (x: east, y: noth, z: up). | */ - public static final int MAV_FRAME_LOCAL_FRD = 20; /* Forward, Right, Down coordinate frame. This is a local frame with Z-down and arbitrary F/R alignment (i.e. not aligned with NED/earth frame). | */ - public static final int MAV_FRAME_LOCAL_FLU = 21; /* Forward, Left, Up coordinate frame. This is a local frame with Z-up and arbitrary F/L alignment (i.e. not aligned with ENU/earth frame). | */ - public static final int MAV_FRAME_ENUM_END = 22; /* | */ + public static final int MAV_FRAME_GLOBAL = 0; /* Global (WGS84) coordinate frame + MSL altitude. First value / x: latitude, second value / y: longitude, third value / z: positive altitude over mean sea level (MSL). | */ + public static final int MAV_FRAME_LOCAL_NED = 1; /* Local coordinate frame, Z-down (x: north, y: east, z: down). | */ + public static final int MAV_FRAME_MISSION = 2; /* NOT a coordinate frame, indicates a mission command. | */ + public static final int MAV_FRAME_GLOBAL_RELATIVE_ALT = 3; /* Global (WGS84) coordinate frame + altitude relative to the home position. First value / x: latitude, second value / y: longitude, third value / z: positive altitude with 0 being at the altitude of the home location. | */ + public static final int MAV_FRAME_LOCAL_ENU = 4; /* Local coordinate frame, Z-up (x: east, y: north, z: up). | */ + public static final int MAV_FRAME_GLOBAL_INT = 5; /* Global (WGS84) coordinate frame (scaled) + MSL altitude. First value / x: latitude in degrees*1.0e-7, second value / y: longitude in degrees*1.0e-7, third value / z: positive altitude over mean sea level (MSL). | */ + public static final int MAV_FRAME_GLOBAL_RELATIVE_ALT_INT = 6; /* Global (WGS84) coordinate frame (scaled) + altitude relative to the home position. First value / x: latitude in degrees*10e-7, second value / y: longitude in degrees*10e-7, third value / z: positive altitude with 0 being at the altitude of the home location. | */ + public static final int MAV_FRAME_LOCAL_OFFSET_NED = 7; /* Offset to the current local frame. Anything expressed in this frame should be added to the current local frame position. | */ + public static final int MAV_FRAME_BODY_NED = 8; /* Setpoint in body NED frame. This makes sense if all position control is externalized - e.g. useful to command 2 m/s^2 acceleration to the right. | */ + public static final int MAV_FRAME_BODY_OFFSET_NED = 9; /* Offset in body NED frame. This makes sense if adding setpoints to the current flight path, to avoid an obstacle - e.g. useful to command 2 m/s^2 acceleration to the east. | */ + public static final int MAV_FRAME_GLOBAL_TERRAIN_ALT = 10; /* Global (WGS84) coordinate frame with AGL altitude (at the waypoint coordinate). First value / x: latitude in degrees, second value / y: longitude in degrees, third value / z: positive altitude in meters with 0 being at ground level in terrain model. | */ + public static final int MAV_FRAME_GLOBAL_TERRAIN_ALT_INT = 11; /* Global (WGS84) coordinate frame (scaled) with AGL altitude (at the waypoint coordinate). First value / x: latitude in degrees*10e-7, second value / y: longitude in degrees*10e-7, third value / z: positive altitude in meters with 0 being at ground level in terrain model. | */ + public static final int MAV_FRAME_BODY_FRD = 12; /* Body fixed frame of reference, Z-down (x: forward, y: right, z: down). | */ + public static final int MAV_FRAME_BODY_FLU = 13; /* Body fixed frame of reference, Z-up (x: forward, y: left, z: up). | */ + public static final int MAV_FRAME_MOCAP_NED = 14; /* Odometry local coordinate frame of data given by a motion capture system, Z-down (x: north, y: east, z: down). | */ + public static final int MAV_FRAME_MOCAP_ENU = 15; /* Odometry local coordinate frame of data given by a motion capture system, Z-up (x: east, y: north, z: up). | */ + public static final int MAV_FRAME_VISION_NED = 16; /* Odometry local coordinate frame of data given by a vision estimation system, Z-down (x: north, y: east, z: down). | */ + public static final int MAV_FRAME_VISION_ENU = 17; /* Odometry local coordinate frame of data given by a vision estimation system, Z-up (x: east, y: north, z: up). | */ + public static final int MAV_FRAME_ESTIM_NED = 18; /* Odometry local coordinate frame of data given by an estimator running onboard the vehicle, Z-down (x: north, y: east, z: down). | */ + public static final int MAV_FRAME_ESTIM_ENU = 19; /* Odometry local coordinate frame of data given by an estimator running onboard the vehicle, Z-up (x: east, y: noth, z: up). | */ + public static final int MAV_FRAME_LOCAL_FRD = 20; /* Forward, Right, Down coordinate frame. This is a local frame with Z-down and arbitrary F/R alignment (i.e. not aligned with NED/earth frame). | */ + public static final int MAV_FRAME_LOCAL_FLU = 21; /* Forward, Left, Up coordinate frame. This is a local frame with Z-up and arbitrary F/L alignment (i.e. not aligned with ENU/earth frame). | */ + public static final int MAV_FRAME_ENUM_END = 22; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_GOTO.java b/app/src/main/java/com/MAVLink/enums/MAV_GOTO.java index f627e68..e07ea3a 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_GOTO.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_GOTO.java @@ -6,14 +6,14 @@ package com.MAVLink.enums; -/** -* Actions that may be specified in MAV_CMD_OVERRIDE_GOTO to override mission execution. -*/ +/** + * Actions that may be specified in MAV_CMD_OVERRIDE_GOTO to override mission execution. + */ public class MAV_GOTO { - public static final int MAV_GOTO_DO_HOLD = 0; /* Hold at the current position. | */ - public static final int MAV_GOTO_DO_CONTINUE = 1; /* Continue with the next item in mission execution. | */ - public static final int MAV_GOTO_HOLD_AT_CURRENT_POSITION = 2; /* Hold at the current position of the system | */ - public static final int MAV_GOTO_HOLD_AT_SPECIFIED_POSITION = 3; /* Hold at the position specified in the parameters of the DO_HOLD action | */ - public static final int MAV_GOTO_ENUM_END = 4; /* | */ + public static final int MAV_GOTO_DO_HOLD = 0; /* Hold at the current position. | */ + public static final int MAV_GOTO_DO_CONTINUE = 1; /* Continue with the next item in mission execution. | */ + public static final int MAV_GOTO_HOLD_AT_CURRENT_POSITION = 2; /* Hold at the current position of the system | */ + public static final int MAV_GOTO_HOLD_AT_SPECIFIED_POSITION = 3; /* Hold at the position specified in the parameters of the DO_HOLD action | */ + public static final int MAV_GOTO_ENUM_END = 4; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_LANDED_STATE.java b/app/src/main/java/com/MAVLink/enums/MAV_LANDED_STATE.java index 5fc729d..f6943ab 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_LANDED_STATE.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_LANDED_STATE.java @@ -6,15 +6,15 @@ package com.MAVLink.enums; -/** -* Enumeration of landed detector states -*/ +/** + * Enumeration of landed detector states + */ public class MAV_LANDED_STATE { - public static final int MAV_LANDED_STATE_UNDEFINED = 0; /* MAV landed state is unknown | */ - public static final int MAV_LANDED_STATE_ON_GROUND = 1; /* MAV is landed (on ground) | */ - public static final int MAV_LANDED_STATE_IN_AIR = 2; /* MAV is in air | */ - public static final int MAV_LANDED_STATE_TAKEOFF = 3; /* MAV currently taking off | */ - public static final int MAV_LANDED_STATE_LANDING = 4; /* MAV currently landing | */ - public static final int MAV_LANDED_STATE_ENUM_END = 5; /* | */ + public static final int MAV_LANDED_STATE_UNDEFINED = 0; /* MAV landed state is unknown | */ + public static final int MAV_LANDED_STATE_ON_GROUND = 1; /* MAV is landed (on ground) | */ + public static final int MAV_LANDED_STATE_IN_AIR = 2; /* MAV is in air | */ + public static final int MAV_LANDED_STATE_TAKEOFF = 3; /* MAV currently taking off | */ + public static final int MAV_LANDED_STATE_LANDING = 4; /* MAV currently landing | */ + public static final int MAV_LANDED_STATE_ENUM_END = 5; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_MISSION_RESULT.java b/app/src/main/java/com/MAVLink/enums/MAV_MISSION_RESULT.java index 2a61a7f..f7669f0 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_MISSION_RESULT.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_MISSION_RESULT.java @@ -6,26 +6,26 @@ package com.MAVLink.enums; -/** -* Result of mission operation (in a MISSION_ACK message). -*/ +/** + * Result of mission operation (in a MISSION_ACK message). + */ public class MAV_MISSION_RESULT { - public static final int MAV_MISSION_ACCEPTED = 0; /* mission accepted OK | */ - public static final int MAV_MISSION_ERROR = 1; /* Generic error / not accepting mission commands at all right now. | */ - public static final int MAV_MISSION_UNSUPPORTED_FRAME = 2; /* Coordinate frame is not supported. | */ - public static final int MAV_MISSION_UNSUPPORTED = 3; /* Command is not supported. | */ - public static final int MAV_MISSION_NO_SPACE = 4; /* Mission item exceeds storage space. | */ - public static final int MAV_MISSION_INVALID = 5; /* One of the parameters has an invalid value. | */ - public static final int MAV_MISSION_INVALID_PARAM1 = 6; /* param1 has an invalid value. | */ - public static final int MAV_MISSION_INVALID_PARAM2 = 7; /* param2 has an invalid value. | */ - public static final int MAV_MISSION_INVALID_PARAM3 = 8; /* param3 has an invalid value. | */ - public static final int MAV_MISSION_INVALID_PARAM4 = 9; /* param4 has an invalid value. | */ - public static final int MAV_MISSION_INVALID_PARAM5_X = 10; /* x / param5 has an invalid value. | */ - public static final int MAV_MISSION_INVALID_PARAM6_Y = 11; /* y / param6 has an invalid value. | */ - public static final int MAV_MISSION_INVALID_PARAM7 = 12; /* z / param7 has an invalid value. | */ - public static final int MAV_MISSION_INVALID_SEQUENCE = 13; /* Mission item received out of sequence | */ - public static final int MAV_MISSION_DENIED = 14; /* Not accepting any mission commands from this communication partner. | */ - public static final int MAV_MISSION_OPERATION_CANCELLED = 15; /* Current mission operation cancelled (e.g. mission upload, mission download). | */ - public static final int MAV_MISSION_RESULT_ENUM_END = 16; /* | */ + public static final int MAV_MISSION_ACCEPTED = 0; /* mission accepted OK | */ + public static final int MAV_MISSION_ERROR = 1; /* Generic error / not accepting mission commands at all right now. | */ + public static final int MAV_MISSION_UNSUPPORTED_FRAME = 2; /* Coordinate frame is not supported. | */ + public static final int MAV_MISSION_UNSUPPORTED = 3; /* Command is not supported. | */ + public static final int MAV_MISSION_NO_SPACE = 4; /* Mission item exceeds storage space. | */ + public static final int MAV_MISSION_INVALID = 5; /* One of the parameters has an invalid value. | */ + public static final int MAV_MISSION_INVALID_PARAM1 = 6; /* param1 has an invalid value. | */ + public static final int MAV_MISSION_INVALID_PARAM2 = 7; /* param2 has an invalid value. | */ + public static final int MAV_MISSION_INVALID_PARAM3 = 8; /* param3 has an invalid value. | */ + public static final int MAV_MISSION_INVALID_PARAM4 = 9; /* param4 has an invalid value. | */ + public static final int MAV_MISSION_INVALID_PARAM5_X = 10; /* x / param5 has an invalid value. | */ + public static final int MAV_MISSION_INVALID_PARAM6_Y = 11; /* y / param6 has an invalid value. | */ + public static final int MAV_MISSION_INVALID_PARAM7 = 12; /* z / param7 has an invalid value. | */ + public static final int MAV_MISSION_INVALID_SEQUENCE = 13; /* Mission item received out of sequence | */ + public static final int MAV_MISSION_DENIED = 14; /* Not accepting any mission commands from this communication partner. | */ + public static final int MAV_MISSION_OPERATION_CANCELLED = 15; /* Current mission operation cancelled (e.g. mission upload, mission download). | */ + public static final int MAV_MISSION_RESULT_ENUM_END = 16; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_MISSION_TYPE.java b/app/src/main/java/com/MAVLink/enums/MAV_MISSION_TYPE.java index 63c11ca..44191c6 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_MISSION_TYPE.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_MISSION_TYPE.java @@ -6,14 +6,14 @@ package com.MAVLink.enums; -/** -* Type of mission items being requested/sent in mission protocol. -*/ +/** + * Type of mission items being requested/sent in mission protocol. + */ public class MAV_MISSION_TYPE { - public static final int MAV_MISSION_TYPE_MISSION = 0; /* Items are mission commands for main mission. | */ - public static final int MAV_MISSION_TYPE_FENCE = 1; /* Specifies GeoFence area(s). Items are MAV_CMD_NAV_FENCE_ GeoFence items. | */ - public static final int MAV_MISSION_TYPE_RALLY = 2; /* Specifies the rally points for the vehicle. Rally points are alternative RTL points. Items are MAV_CMD_NAV_RALLY_POINT rally point items. | */ - public static final int MAV_MISSION_TYPE_ALL = 255; /* Only used in MISSION_CLEAR_ALL to clear all mission types. | */ - public static final int MAV_MISSION_TYPE_ENUM_END = 256; /* | */ + public static final int MAV_MISSION_TYPE_MISSION = 0; /* Items are mission commands for main mission. | */ + public static final int MAV_MISSION_TYPE_FENCE = 1; /* Specifies GeoFence area(s). Items are MAV_CMD_NAV_FENCE_ GeoFence items. | */ + public static final int MAV_MISSION_TYPE_RALLY = 2; /* Specifies the rally points for the vehicle. Rally points are alternative RTL points. Items are MAV_CMD_NAV_RALLY_POINT rally point items. | */ + public static final int MAV_MISSION_TYPE_ALL = 255; /* Only used in MISSION_CLEAR_ALL to clear all mission types. | */ + public static final int MAV_MISSION_TYPE_ENUM_END = 256; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_MODE.java b/app/src/main/java/com/MAVLink/enums/MAV_MODE.java index 79c72de..e52d38c 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_MODE.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_MODE.java @@ -6,22 +6,22 @@ package com.MAVLink.enums; -/** -* These defines are predefined OR-combined mode flags. There is no need to use values from this enum, but it - simplifies the use of the mode flags. Note that manual input is enabled in all modes as a safety override. -*/ +/** + * These defines are predefined OR-combined mode flags. There is no need to use values from this enum, but it + * simplifies the use of the mode flags. Note that manual input is enabled in all modes as a safety override. + */ public class MAV_MODE { - public static final int MAV_MODE_PREFLIGHT = 0; /* System is not ready to fly, booting, calibrating, etc. No flag is set. | */ - public static final int MAV_MODE_MANUAL_DISARMED = 64; /* System is allowed to be active, under manual (RC) control, no stabilization | */ - public static final int MAV_MODE_TEST_DISARMED = 66; /* UNDEFINED mode. This solely depends on the autopilot - use with caution, intended for developers only. | */ - public static final int MAV_MODE_STABILIZE_DISARMED = 80; /* System is allowed to be active, under assisted RC control. | */ - public static final int MAV_MODE_GUIDED_DISARMED = 88; /* System is allowed to be active, under autonomous control, manual setpoint | */ - public static final int MAV_MODE_AUTO_DISARMED = 92; /* System is allowed to be active, under autonomous control and navigation (the trajectory is decided onboard and not pre-programmed by waypoints) | */ - public static final int MAV_MODE_MANUAL_ARMED = 192; /* System is allowed to be active, under manual (RC) control, no stabilization | */ - public static final int MAV_MODE_TEST_ARMED = 194; /* UNDEFINED mode. This solely depends on the autopilot - use with caution, intended for developers only. | */ - public static final int MAV_MODE_STABILIZE_ARMED = 208; /* System is allowed to be active, under assisted RC control. | */ - public static final int MAV_MODE_GUIDED_ARMED = 216; /* System is allowed to be active, under autonomous control, manual setpoint | */ - public static final int MAV_MODE_AUTO_ARMED = 220; /* System is allowed to be active, under autonomous control and navigation (the trajectory is decided onboard and not pre-programmed by waypoints) | */ - public static final int MAV_MODE_ENUM_END = 221; /* | */ + public static final int MAV_MODE_PREFLIGHT = 0; /* System is not ready to fly, booting, calibrating, etc. No flag is set. | */ + public static final int MAV_MODE_MANUAL_DISARMED = 64; /* System is allowed to be active, under manual (RC) control, no stabilization | */ + public static final int MAV_MODE_TEST_DISARMED = 66; /* UNDEFINED mode. This solely depends on the autopilot - use with caution, intended for developers only. | */ + public static final int MAV_MODE_STABILIZE_DISARMED = 80; /* System is allowed to be active, under assisted RC control. | */ + public static final int MAV_MODE_GUIDED_DISARMED = 88; /* System is allowed to be active, under autonomous control, manual setpoint | */ + public static final int MAV_MODE_AUTO_DISARMED = 92; /* System is allowed to be active, under autonomous control and navigation (the trajectory is decided onboard and not pre-programmed by waypoints) | */ + public static final int MAV_MODE_MANUAL_ARMED = 192; /* System is allowed to be active, under manual (RC) control, no stabilization | */ + public static final int MAV_MODE_TEST_ARMED = 194; /* UNDEFINED mode. This solely depends on the autopilot - use with caution, intended for developers only. | */ + public static final int MAV_MODE_STABILIZE_ARMED = 208; /* System is allowed to be active, under assisted RC control. | */ + public static final int MAV_MODE_GUIDED_ARMED = 216; /* System is allowed to be active, under autonomous control, manual setpoint | */ + public static final int MAV_MODE_AUTO_ARMED = 220; /* System is allowed to be active, under autonomous control and navigation (the trajectory is decided onboard and not pre-programmed by waypoints) | */ + public static final int MAV_MODE_ENUM_END = 221; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_MODE_FLAG.java b/app/src/main/java/com/MAVLink/enums/MAV_MODE_FLAG.java index db59377..68dff7c 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_MODE_FLAG.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_MODE_FLAG.java @@ -6,18 +6,18 @@ package com.MAVLink.enums; -/** -* These flags encode the MAV mode. -*/ +/** + * These flags encode the MAV mode. + */ public class MAV_MODE_FLAG { - public static final int MAV_MODE_FLAG_CUSTOM_MODE_ENABLED = 1; /* 0b00000001 Reserved for future use. | */ - public static final int MAV_MODE_FLAG_TEST_ENABLED = 2; /* 0b00000010 system has a test mode enabled. This flag is intended for temporary system tests and should not be used for stable implementations. | */ - public static final int MAV_MODE_FLAG_AUTO_ENABLED = 4; /* 0b00000100 autonomous mode enabled, system finds its own goal positions. Guided flag can be set or not, depends on the actual implementation. | */ - public static final int MAV_MODE_FLAG_GUIDED_ENABLED = 8; /* 0b00001000 guided mode enabled, system flies waypoints / mission items. | */ - public static final int MAV_MODE_FLAG_STABILIZE_ENABLED = 16; /* 0b00010000 system stabilizes electronically its attitude (and optionally position). It needs however further control inputs to move around. | */ - public static final int MAV_MODE_FLAG_HIL_ENABLED = 32; /* 0b00100000 hardware in the loop simulation. All motors / actuators are blocked, but internal software is full operational. | */ - public static final int MAV_MODE_FLAG_MANUAL_INPUT_ENABLED = 64; /* 0b01000000 remote control input is enabled. | */ - public static final int MAV_MODE_FLAG_SAFETY_ARMED = 128; /* 0b10000000 MAV safety set to armed. Motors are enabled / running / can start. Ready to fly. Additional note: this flag is to be ignore when sent in the command MAV_CMD_DO_SET_MODE and MAV_CMD_COMPONENT_ARM_DISARM shall be used instead. The flag can still be used to report the armed state. | */ - public static final int MAV_MODE_FLAG_ENUM_END = 129; /* | */ + public static final int MAV_MODE_FLAG_CUSTOM_MODE_ENABLED = 1; /* 0b00000001 Reserved for future use. | */ + public static final int MAV_MODE_FLAG_TEST_ENABLED = 2; /* 0b00000010 system has a test mode enabled. This flag is intended for temporary system tests and should not be used for stable implementations. | */ + public static final int MAV_MODE_FLAG_AUTO_ENABLED = 4; /* 0b00000100 autonomous mode enabled, system finds its own goal positions. Guided flag can be set or not, depends on the actual implementation. | */ + public static final int MAV_MODE_FLAG_GUIDED_ENABLED = 8; /* 0b00001000 guided mode enabled, system flies waypoints / mission items. | */ + public static final int MAV_MODE_FLAG_STABILIZE_ENABLED = 16; /* 0b00010000 system stabilizes electronically its attitude (and optionally position). It needs however further control inputs to move around. | */ + public static final int MAV_MODE_FLAG_HIL_ENABLED = 32; /* 0b00100000 hardware in the loop simulation. All motors / actuators are blocked, but internal software is full operational. | */ + public static final int MAV_MODE_FLAG_MANUAL_INPUT_ENABLED = 64; /* 0b01000000 remote control input is enabled. | */ + public static final int MAV_MODE_FLAG_SAFETY_ARMED = 128; /* 0b10000000 MAV safety set to armed. Motors are enabled / running / can start. Ready to fly. Additional note: this flag is to be ignore when sent in the command MAV_CMD_DO_SET_MODE and MAV_CMD_COMPONENT_ARM_DISARM shall be used instead. The flag can still be used to report the armed state. | */ + public static final int MAV_MODE_FLAG_ENUM_END = 129; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_MODE_FLAG_DECODE_POSITION.java b/app/src/main/java/com/MAVLink/enums/MAV_MODE_FLAG_DECODE_POSITION.java index 68798a7..a8af15f 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_MODE_FLAG_DECODE_POSITION.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_MODE_FLAG_DECODE_POSITION.java @@ -6,18 +6,18 @@ package com.MAVLink.enums; -/** -* These values encode the bit positions of the decode position. These values can be used to read the value of a flag bit by combining the base_mode variable with AND with the flag position value. The result will be either 0 or 1, depending on if the flag is set or not. -*/ +/** + * These values encode the bit positions of the decode position. These values can be used to read the value of a flag bit by combining the base_mode variable with AND with the flag position value. The result will be either 0 or 1, depending on if the flag is set or not. + */ public class MAV_MODE_FLAG_DECODE_POSITION { - public static final int MAV_MODE_FLAG_DECODE_POSITION_CUSTOM_MODE = 1; /* Eighth bit: 00000001 | */ - public static final int MAV_MODE_FLAG_DECODE_POSITION_TEST = 2; /* Seventh bit: 00000010 | */ - public static final int MAV_MODE_FLAG_DECODE_POSITION_AUTO = 4; /* Sixth bit: 00000100 | */ - public static final int MAV_MODE_FLAG_DECODE_POSITION_GUIDED = 8; /* Fifth bit: 00001000 | */ - public static final int MAV_MODE_FLAG_DECODE_POSITION_STABILIZE = 16; /* Fourth bit: 00010000 | */ - public static final int MAV_MODE_FLAG_DECODE_POSITION_HIL = 32; /* Third bit: 00100000 | */ - public static final int MAV_MODE_FLAG_DECODE_POSITION_MANUAL = 64; /* Second bit: 01000000 | */ - public static final int MAV_MODE_FLAG_DECODE_POSITION_SAFETY = 128; /* First bit: 10000000 | */ - public static final int MAV_MODE_FLAG_DECODE_POSITION_ENUM_END = 129; /* | */ + public static final int MAV_MODE_FLAG_DECODE_POSITION_CUSTOM_MODE = 1; /* Eighth bit: 00000001 | */ + public static final int MAV_MODE_FLAG_DECODE_POSITION_TEST = 2; /* Seventh bit: 00000010 | */ + public static final int MAV_MODE_FLAG_DECODE_POSITION_AUTO = 4; /* Sixth bit: 00000100 | */ + public static final int MAV_MODE_FLAG_DECODE_POSITION_GUIDED = 8; /* Fifth bit: 00001000 | */ + public static final int MAV_MODE_FLAG_DECODE_POSITION_STABILIZE = 16; /* Fourth bit: 00010000 | */ + public static final int MAV_MODE_FLAG_DECODE_POSITION_HIL = 32; /* Third bit: 00100000 | */ + public static final int MAV_MODE_FLAG_DECODE_POSITION_MANUAL = 64; /* Second bit: 01000000 | */ + public static final int MAV_MODE_FLAG_DECODE_POSITION_SAFETY = 128; /* First bit: 10000000 | */ + public static final int MAV_MODE_FLAG_DECODE_POSITION_ENUM_END = 129; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_MODE_GIMBAL.java b/app/src/main/java/com/MAVLink/enums/MAV_MODE_GIMBAL.java index 06b42e4..e7dbf4c 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_MODE_GIMBAL.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_MODE_GIMBAL.java @@ -6,17 +6,17 @@ package com.MAVLink.enums; -/** -* -*/ +/** + * + */ public class MAV_MODE_GIMBAL { - public static final int MAV_MODE_GIMBAL_UNINITIALIZED = 0; /* Gimbal is powered on but has not started initializing yet. | */ - public static final int MAV_MODE_GIMBAL_CALIBRATING_PITCH = 1; /* Gimbal is currently running calibration on the pitch axis. | */ - public static final int MAV_MODE_GIMBAL_CALIBRATING_ROLL = 2; /* Gimbal is currently running calibration on the roll axis. | */ - public static final int MAV_MODE_GIMBAL_CALIBRATING_YAW = 3; /* Gimbal is currently running calibration on the yaw axis. | */ - public static final int MAV_MODE_GIMBAL_INITIALIZED = 4; /* Gimbal has finished calibrating and initializing, but is relaxed pending reception of first rate command from copter. | */ - public static final int MAV_MODE_GIMBAL_ACTIVE = 5; /* Gimbal is actively stabilizing. | */ - public static final int MAV_MODE_GIMBAL_RATE_CMD_TIMEOUT = 6; /* Gimbal is relaxed because it missed more than 10 expected rate command messages in a row. Gimbal will move back to active mode when it receives a new rate command. | */ - public static final int MAV_MODE_GIMBAL_ENUM_END = 7; /* | */ + public static final int MAV_MODE_GIMBAL_UNINITIALIZED = 0; /* Gimbal is powered on but has not started initializing yet. | */ + public static final int MAV_MODE_GIMBAL_CALIBRATING_PITCH = 1; /* Gimbal is currently running calibration on the pitch axis. | */ + public static final int MAV_MODE_GIMBAL_CALIBRATING_ROLL = 2; /* Gimbal is currently running calibration on the roll axis. | */ + public static final int MAV_MODE_GIMBAL_CALIBRATING_YAW = 3; /* Gimbal is currently running calibration on the yaw axis. | */ + public static final int MAV_MODE_GIMBAL_INITIALIZED = 4; /* Gimbal has finished calibrating and initializing, but is relaxed pending reception of first rate command from copter. | */ + public static final int MAV_MODE_GIMBAL_ACTIVE = 5; /* Gimbal is actively stabilizing. | */ + public static final int MAV_MODE_GIMBAL_RATE_CMD_TIMEOUT = 6; /* Gimbal is relaxed because it missed more than 10 expected rate command messages in a row. Gimbal will move back to active mode when it receives a new rate command. | */ + public static final int MAV_MODE_GIMBAL_ENUM_END = 7; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_MOUNT_MODE.java b/app/src/main/java/com/MAVLink/enums/MAV_MOUNT_MODE.java index 085e961..ba6bb8b 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_MOUNT_MODE.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_MOUNT_MODE.java @@ -6,16 +6,16 @@ package com.MAVLink.enums; -/** -* Enumeration of possible mount operation modes -*/ +/** + * Enumeration of possible mount operation modes + */ public class MAV_MOUNT_MODE { - public static final int MAV_MOUNT_MODE_RETRACT = 0; /* Load and keep safe position (Roll,Pitch,Yaw) from permant memory and stop stabilization | */ - public static final int MAV_MOUNT_MODE_NEUTRAL = 1; /* Load and keep neutral position (Roll,Pitch,Yaw) from permanent memory. | */ - public static final int MAV_MOUNT_MODE_MAVLINK_TARGETING = 2; /* Load neutral position and start MAVLink Roll,Pitch,Yaw control with stabilization | */ - public static final int MAV_MOUNT_MODE_RC_TARGETING = 3; /* Load neutral position and start RC Roll,Pitch,Yaw control with stabilization | */ - public static final int MAV_MOUNT_MODE_GPS_POINT = 4; /* Load neutral position and start to point to Lat,Lon,Alt | */ - public static final int MAV_MOUNT_MODE_SYSID_TARGET = 5; /* Gimbal tracks system with specified system ID | */ - public static final int MAV_MOUNT_MODE_ENUM_END = 6; /* | */ + public static final int MAV_MOUNT_MODE_RETRACT = 0; /* Load and keep safe position (Roll,Pitch,Yaw) from permant memory and stop stabilization | */ + public static final int MAV_MOUNT_MODE_NEUTRAL = 1; /* Load and keep neutral position (Roll,Pitch,Yaw) from permanent memory. | */ + public static final int MAV_MOUNT_MODE_MAVLINK_TARGETING = 2; /* Load neutral position and start MAVLink Roll,Pitch,Yaw control with stabilization | */ + public static final int MAV_MOUNT_MODE_RC_TARGETING = 3; /* Load neutral position and start RC Roll,Pitch,Yaw control with stabilization | */ + public static final int MAV_MOUNT_MODE_GPS_POINT = 4; /* Load neutral position and start to point to Lat,Lon,Alt | */ + public static final int MAV_MOUNT_MODE_SYSID_TARGET = 5; /* Gimbal tracks system with specified system ID | */ + public static final int MAV_MOUNT_MODE_ENUM_END = 6; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_ODID_AUTH_TYPE.java b/app/src/main/java/com/MAVLink/enums/MAV_ODID_AUTH_TYPE.java index 5cdfd88..9900113 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_ODID_AUTH_TYPE.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_ODID_AUTH_TYPE.java @@ -6,15 +6,15 @@ package com.MAVLink.enums; -/** -* -*/ +/** + * + */ public class MAV_ODID_AUTH_TYPE { - public static final int MAV_ODID_AUTH_TYPE_NONE = 0; /* No authentication type is specified. | */ - public static final int MAV_ODID_AUTH_TYPE_UAS_ID_SIGNATURE = 1; /* Signature for the UAS (Unmanned Aircraft System) ID. | */ - public static final int MAV_ODID_AUTH_TYPE_OPERATOR_ID_SIGNATURE = 2; /* Signature for the Operator ID. | */ - public static final int MAV_ODID_AUTH_TYPE_MESSAGE_SET_SIGNATURE = 3; /* Signature for the entire message set. | */ - public static final int MAV_ODID_AUTH_TYPE_NETWORK_REMOTE_ID = 4; /* Authentication is provided by Network Remote ID. | */ - public static final int MAV_ODID_AUTH_TYPE_ENUM_END = 5; /* | */ + public static final int MAV_ODID_AUTH_TYPE_NONE = 0; /* No authentication type is specified. | */ + public static final int MAV_ODID_AUTH_TYPE_UAS_ID_SIGNATURE = 1; /* Signature for the UAS (Unmanned Aircraft System) ID. | */ + public static final int MAV_ODID_AUTH_TYPE_OPERATOR_ID_SIGNATURE = 2; /* Signature for the Operator ID. | */ + public static final int MAV_ODID_AUTH_TYPE_MESSAGE_SET_SIGNATURE = 3; /* Signature for the entire message set. | */ + public static final int MAV_ODID_AUTH_TYPE_NETWORK_REMOTE_ID = 4; /* Authentication is provided by Network Remote ID. | */ + public static final int MAV_ODID_AUTH_TYPE_ENUM_END = 5; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_ODID_DESC_TYPE.java b/app/src/main/java/com/MAVLink/enums/MAV_ODID_DESC_TYPE.java index 14587af..8047e8a 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_ODID_DESC_TYPE.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_ODID_DESC_TYPE.java @@ -6,11 +6,11 @@ package com.MAVLink.enums; -/** -* -*/ +/** + * + */ public class MAV_ODID_DESC_TYPE { - public static final int MAV_ODID_DESC_TYPE_TEXT = 0; /* Free-form text description of the purpose of the flight. | */ - public static final int MAV_ODID_DESC_TYPE_ENUM_END = 1; /* | */ + public static final int MAV_ODID_DESC_TYPE_TEXT = 0; /* Free-form text description of the purpose of the flight. | */ + public static final int MAV_ODID_DESC_TYPE_ENUM_END = 1; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_ODID_HEIGHT_REF.java b/app/src/main/java/com/MAVLink/enums/MAV_ODID_HEIGHT_REF.java index e2db378..2268f50 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_ODID_HEIGHT_REF.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_ODID_HEIGHT_REF.java @@ -6,12 +6,12 @@ package com.MAVLink.enums; -/** -* -*/ +/** + * + */ public class MAV_ODID_HEIGHT_REF { - public static final int MAV_ODID_HEIGHT_REF_OVER_TAKEOFF = 0; /* The height field is relative to the take-off location. | */ - public static final int MAV_ODID_HEIGHT_REF_OVER_GROUND = 1; /* The height field is relative to ground. | */ - public static final int MAV_ODID_HEIGHT_REF_ENUM_END = 2; /* | */ + public static final int MAV_ODID_HEIGHT_REF_OVER_TAKEOFF = 0; /* The height field is relative to the take-off location. | */ + public static final int MAV_ODID_HEIGHT_REF_OVER_GROUND = 1; /* The height field is relative to ground. | */ + public static final int MAV_ODID_HEIGHT_REF_ENUM_END = 2; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_ODID_HOR_ACC.java b/app/src/main/java/com/MAVLink/enums/MAV_ODID_HOR_ACC.java index 842428f..a7564d0 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_ODID_HOR_ACC.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_ODID_HOR_ACC.java @@ -6,23 +6,23 @@ package com.MAVLink.enums; -/** -* -*/ +/** + * + */ public class MAV_ODID_HOR_ACC { - public static final int MAV_ODID_HOR_ACC_UNKNOWN = 0; /* The horizontal accuracy is unknown. | */ - public static final int MAV_ODID_HOR_ACC_10NM = 1; /* The horizontal accuracy is smaller than 10 Nautical Miles. 18.52 km. | */ - public static final int MAV_ODID_HOR_ACC_4NM = 2; /* The horizontal accuracy is smaller than 4 Nautical Miles. 7.408 km. | */ - public static final int MAV_ODID_HOR_ACC_2NM = 3; /* The horizontal accuracy is smaller than 2 Nautical Miles. 3.704 km. | */ - public static final int MAV_ODID_HOR_ACC_1NM = 4; /* The horizontal accuracy is smaller than 1 Nautical Miles. 1.852 km. | */ - public static final int MAV_ODID_HOR_ACC_0_5NM = 5; /* The horizontal accuracy is smaller than 0.5 Nautical Miles. 926 m. | */ - public static final int MAV_ODID_HOR_ACC_0_3NM = 6; /* The horizontal accuracy is smaller than 0.3 Nautical Miles. 555.6 m. | */ - public static final int MAV_ODID_HOR_ACC_0_1NM = 7; /* The horizontal accuracy is smaller than 0.1 Nautical Miles. 185.2 m. | */ - public static final int MAV_ODID_HOR_ACC_0_05NM = 8; /* The horizontal accuracy is smaller than 0.05 Nautical Miles. 92.6 m. | */ - public static final int MAV_ODID_HOR_ACC_30_METER = 9; /* The horizontal accuracy is smaller than 30 meter. | */ - public static final int MAV_ODID_HOR_ACC_10_METER = 10; /* The horizontal accuracy is smaller than 10 meter. | */ - public static final int MAV_ODID_HOR_ACC_3_METER = 11; /* The horizontal accuracy is smaller than 3 meter. | */ - public static final int MAV_ODID_HOR_ACC_1_METER = 12; /* The horizontal accuracy is smaller than 1 meter. | */ - public static final int MAV_ODID_HOR_ACC_ENUM_END = 13; /* | */ + public static final int MAV_ODID_HOR_ACC_UNKNOWN = 0; /* The horizontal accuracy is unknown. | */ + public static final int MAV_ODID_HOR_ACC_10NM = 1; /* The horizontal accuracy is smaller than 10 Nautical Miles. 18.52 km. | */ + public static final int MAV_ODID_HOR_ACC_4NM = 2; /* The horizontal accuracy is smaller than 4 Nautical Miles. 7.408 km. | */ + public static final int MAV_ODID_HOR_ACC_2NM = 3; /* The horizontal accuracy is smaller than 2 Nautical Miles. 3.704 km. | */ + public static final int MAV_ODID_HOR_ACC_1NM = 4; /* The horizontal accuracy is smaller than 1 Nautical Miles. 1.852 km. | */ + public static final int MAV_ODID_HOR_ACC_0_5NM = 5; /* The horizontal accuracy is smaller than 0.5 Nautical Miles. 926 m. | */ + public static final int MAV_ODID_HOR_ACC_0_3NM = 6; /* The horizontal accuracy is smaller than 0.3 Nautical Miles. 555.6 m. | */ + public static final int MAV_ODID_HOR_ACC_0_1NM = 7; /* The horizontal accuracy is smaller than 0.1 Nautical Miles. 185.2 m. | */ + public static final int MAV_ODID_HOR_ACC_0_05NM = 8; /* The horizontal accuracy is smaller than 0.05 Nautical Miles. 92.6 m. | */ + public static final int MAV_ODID_HOR_ACC_30_METER = 9; /* The horizontal accuracy is smaller than 30 meter. | */ + public static final int MAV_ODID_HOR_ACC_10_METER = 10; /* The horizontal accuracy is smaller than 10 meter. | */ + public static final int MAV_ODID_HOR_ACC_3_METER = 11; /* The horizontal accuracy is smaller than 3 meter. | */ + public static final int MAV_ODID_HOR_ACC_1_METER = 12; /* The horizontal accuracy is smaller than 1 meter. | */ + public static final int MAV_ODID_HOR_ACC_ENUM_END = 13; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_ODID_ID_TYPE.java b/app/src/main/java/com/MAVLink/enums/MAV_ODID_ID_TYPE.java index a5f4eb6..a402635 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_ODID_ID_TYPE.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_ODID_ID_TYPE.java @@ -6,14 +6,14 @@ package com.MAVLink.enums; -/** -* -*/ +/** + * + */ public class MAV_ODID_ID_TYPE { - public static final int MAV_ODID_ID_TYPE_NONE = 0; /* No type defined. | */ - public static final int MAV_ODID_ID_TYPE_SERIAL_NUMBER = 1; /* Manufacturer Serial Number (ANSI/CTA-2063 format). | */ - public static final int MAV_ODID_ID_TYPE_CAA_REGISTRATION_ID = 2; /* CAA (Civil Aviation Authority) registered ID. Format: [ICAO Country Code].[CAA Assigned ID]. | */ - public static final int MAV_ODID_ID_TYPE_UTM_ASSIGNED_UUID = 3; /* UTM (Unmanned Traffic Management) assigned UUID (RFC4122). | */ - public static final int MAV_ODID_ID_TYPE_ENUM_END = 4; /* | */ + public static final int MAV_ODID_ID_TYPE_NONE = 0; /* No type defined. | */ + public static final int MAV_ODID_ID_TYPE_SERIAL_NUMBER = 1; /* Manufacturer Serial Number (ANSI/CTA-2063 format). | */ + public static final int MAV_ODID_ID_TYPE_CAA_REGISTRATION_ID = 2; /* CAA (Civil Aviation Authority) registered ID. Format: [ICAO Country Code].[CAA Assigned ID]. | */ + public static final int MAV_ODID_ID_TYPE_UTM_ASSIGNED_UUID = 3; /* UTM (Unmanned Traffic Management) assigned UUID (RFC4122). | */ + public static final int MAV_ODID_ID_TYPE_ENUM_END = 4; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_ODID_LOCATION_SRC.java b/app/src/main/java/com/MAVLink/enums/MAV_ODID_LOCATION_SRC.java index c75c882..d19b99c 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_ODID_LOCATION_SRC.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_ODID_LOCATION_SRC.java @@ -6,13 +6,13 @@ package com.MAVLink.enums; -/** -* -*/ +/** + * + */ public class MAV_ODID_LOCATION_SRC { - public static final int MAV_ODID_LOCATION_SRC_TAKEOFF = 0; /* The location of the operator is the same as the take-off location. | */ - public static final int MAV_ODID_LOCATION_SRC_LIVE_GNSS = 1; /* The location of the operator is based on live GNSS data. | */ - public static final int MAV_ODID_LOCATION_SRC_FIXED = 2; /* The location of the operator is a fixed location. | */ - public static final int MAV_ODID_LOCATION_SRC_ENUM_END = 3; /* | */ + public static final int MAV_ODID_LOCATION_SRC_TAKEOFF = 0; /* The location of the operator is the same as the take-off location. | */ + public static final int MAV_ODID_LOCATION_SRC_LIVE_GNSS = 1; /* The location of the operator is based on live GNSS data. | */ + public static final int MAV_ODID_LOCATION_SRC_FIXED = 2; /* The location of the operator is a fixed location. | */ + public static final int MAV_ODID_LOCATION_SRC_ENUM_END = 3; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_ODID_OPERATOR_ID_TYPE.java b/app/src/main/java/com/MAVLink/enums/MAV_ODID_OPERATOR_ID_TYPE.java index bf5ae12..221d9e7 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_ODID_OPERATOR_ID_TYPE.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_ODID_OPERATOR_ID_TYPE.java @@ -6,11 +6,11 @@ package com.MAVLink.enums; -/** -* -*/ +/** + * + */ public class MAV_ODID_OPERATOR_ID_TYPE { - public static final int MAV_ODID_OPERATOR_ID_TYPE_CAA = 0; /* CAA (Civil Aviation Authority) registered operator ID. | */ - public static final int MAV_ODID_OPERATOR_ID_TYPE_ENUM_END = 1; /* | */ + public static final int MAV_ODID_OPERATOR_ID_TYPE_CAA = 0; /* CAA (Civil Aviation Authority) registered operator ID. | */ + public static final int MAV_ODID_OPERATOR_ID_TYPE_ENUM_END = 1; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_ODID_SPEED_ACC.java b/app/src/main/java/com/MAVLink/enums/MAV_ODID_SPEED_ACC.java index 977d9ad..b4b09a0 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_ODID_SPEED_ACC.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_ODID_SPEED_ACC.java @@ -6,15 +6,15 @@ package com.MAVLink.enums; -/** -* -*/ +/** + * + */ public class MAV_ODID_SPEED_ACC { - public static final int MAV_ODID_SPEED_ACC_UNKNOWN = 0; /* The speed accuracy is unknown. | */ - public static final int MAV_ODID_SPEED_ACC_10_METERS_PER_SECOND = 1; /* The speed accuracy is smaller than 10 meters per second. | */ - public static final int MAV_ODID_SPEED_ACC_3_METERS_PER_SECOND = 2; /* The speed accuracy is smaller than 3 meters per second. | */ - public static final int MAV_ODID_SPEED_ACC_1_METERS_PER_SECOND = 3; /* The speed accuracy is smaller than 1 meters per second. | */ - public static final int MAV_ODID_SPEED_ACC_0_3_METERS_PER_SECOND = 4; /* The speed accuracy is smaller than 0.3 meters per second. | */ - public static final int MAV_ODID_SPEED_ACC_ENUM_END = 5; /* | */ + public static final int MAV_ODID_SPEED_ACC_UNKNOWN = 0; /* The speed accuracy is unknown. | */ + public static final int MAV_ODID_SPEED_ACC_10_METERS_PER_SECOND = 1; /* The speed accuracy is smaller than 10 meters per second. | */ + public static final int MAV_ODID_SPEED_ACC_3_METERS_PER_SECOND = 2; /* The speed accuracy is smaller than 3 meters per second. | */ + public static final int MAV_ODID_SPEED_ACC_1_METERS_PER_SECOND = 3; /* The speed accuracy is smaller than 1 meters per second. | */ + public static final int MAV_ODID_SPEED_ACC_0_3_METERS_PER_SECOND = 4; /* The speed accuracy is smaller than 0.3 meters per second. | */ + public static final int MAV_ODID_SPEED_ACC_ENUM_END = 5; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_ODID_STATUS.java b/app/src/main/java/com/MAVLink/enums/MAV_ODID_STATUS.java index 13c69d4..dbb357c 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_ODID_STATUS.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_ODID_STATUS.java @@ -6,13 +6,13 @@ package com.MAVLink.enums; -/** -* -*/ +/** + * + */ public class MAV_ODID_STATUS { - public static final int MAV_ODID_STATUS_UNDECLARED = 0; /* The status of the (UA) Unmanned Aircraft is undefined. | */ - public static final int MAV_ODID_STATUS_GROUND = 1; /* The UA is on the ground. | */ - public static final int MAV_ODID_STATUS_AIRBORNE = 2; /* The UA is in the air. | */ - public static final int MAV_ODID_STATUS_ENUM_END = 3; /* | */ + public static final int MAV_ODID_STATUS_UNDECLARED = 0; /* The status of the (UA) Unmanned Aircraft is undefined. | */ + public static final int MAV_ODID_STATUS_GROUND = 1; /* The UA is on the ground. | */ + public static final int MAV_ODID_STATUS_AIRBORNE = 2; /* The UA is in the air. | */ + public static final int MAV_ODID_STATUS_ENUM_END = 3; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_ODID_TIME_ACC.java b/app/src/main/java/com/MAVLink/enums/MAV_ODID_TIME_ACC.java index d47c1a8..2fa9a4c 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_ODID_TIME_ACC.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_ODID_TIME_ACC.java @@ -6,26 +6,26 @@ package com.MAVLink.enums; -/** -* -*/ +/** + * + */ public class MAV_ODID_TIME_ACC { - public static final int MAV_ODID_TIME_ACC_UNKNOWN = 0; /* The timestamp accuracy is unknown. | */ - public static final int MAV_ODID_TIME_ACC_0_1_SECOND = 1; /* The timestamp accuracy is smaller than 0.1 second. | */ - public static final int MAV_ODID_TIME_ACC_0_2_SECOND = 2; /* The timestamp accuracy is smaller than 0.2 second. | */ - public static final int MAV_ODID_TIME_ACC_0_3_SECOND = 3; /* The timestamp accuracy is smaller than 0.3 second. | */ - public static final int MAV_ODID_TIME_ACC_0_4_SECOND = 4; /* The timestamp accuracy is smaller than 0.4 second. | */ - public static final int MAV_ODID_TIME_ACC_0_5_SECOND = 5; /* The timestamp accuracy is smaller than 0.5 second. | */ - public static final int MAV_ODID_TIME_ACC_0_6_SECOND = 6; /* The timestamp accuracy is smaller than 0.6 second. | */ - public static final int MAV_ODID_TIME_ACC_0_7_SECOND = 7; /* The timestamp accuracy is smaller than 0.7 second. | */ - public static final int MAV_ODID_TIME_ACC_0_8_SECOND = 8; /* The timestamp accuracy is smaller than 0.8 second. | */ - public static final int MAV_ODID_TIME_ACC_0_9_SECOND = 9; /* The timestamp accuracy is smaller than 0.9 second. | */ - public static final int MAV_ODID_TIME_ACC_1_0_SECOND = 10; /* The timestamp accuracy is smaller than 1.0 second. | */ - public static final int MAV_ODID_TIME_ACC_1_1_SECOND = 11; /* The timestamp accuracy is smaller than 1.1 second. | */ - public static final int MAV_ODID_TIME_ACC_1_2_SECOND = 12; /* The timestamp accuracy is smaller than 1.2 second. | */ - public static final int MAV_ODID_TIME_ACC_1_3_SECOND = 13; /* The timestamp accuracy is smaller than 1.3 second. | */ - public static final int MAV_ODID_TIME_ACC_1_4_SECOND = 14; /* The timestamp accuracy is smaller than 1.4 second. | */ - public static final int MAV_ODID_TIME_ACC_1_5_SECOND = 15; /* The timestamp accuracy is smaller than 1.5 second. | */ - public static final int MAV_ODID_TIME_ACC_ENUM_END = 16; /* | */ + public static final int MAV_ODID_TIME_ACC_UNKNOWN = 0; /* The timestamp accuracy is unknown. | */ + public static final int MAV_ODID_TIME_ACC_0_1_SECOND = 1; /* The timestamp accuracy is smaller than 0.1 second. | */ + public static final int MAV_ODID_TIME_ACC_0_2_SECOND = 2; /* The timestamp accuracy is smaller than 0.2 second. | */ + public static final int MAV_ODID_TIME_ACC_0_3_SECOND = 3; /* The timestamp accuracy is smaller than 0.3 second. | */ + public static final int MAV_ODID_TIME_ACC_0_4_SECOND = 4; /* The timestamp accuracy is smaller than 0.4 second. | */ + public static final int MAV_ODID_TIME_ACC_0_5_SECOND = 5; /* The timestamp accuracy is smaller than 0.5 second. | */ + public static final int MAV_ODID_TIME_ACC_0_6_SECOND = 6; /* The timestamp accuracy is smaller than 0.6 second. | */ + public static final int MAV_ODID_TIME_ACC_0_7_SECOND = 7; /* The timestamp accuracy is smaller than 0.7 second. | */ + public static final int MAV_ODID_TIME_ACC_0_8_SECOND = 8; /* The timestamp accuracy is smaller than 0.8 second. | */ + public static final int MAV_ODID_TIME_ACC_0_9_SECOND = 9; /* The timestamp accuracy is smaller than 0.9 second. | */ + public static final int MAV_ODID_TIME_ACC_1_0_SECOND = 10; /* The timestamp accuracy is smaller than 1.0 second. | */ + public static final int MAV_ODID_TIME_ACC_1_1_SECOND = 11; /* The timestamp accuracy is smaller than 1.1 second. | */ + public static final int MAV_ODID_TIME_ACC_1_2_SECOND = 12; /* The timestamp accuracy is smaller than 1.2 second. | */ + public static final int MAV_ODID_TIME_ACC_1_3_SECOND = 13; /* The timestamp accuracy is smaller than 1.3 second. | */ + public static final int MAV_ODID_TIME_ACC_1_4_SECOND = 14; /* The timestamp accuracy is smaller than 1.4 second. | */ + public static final int MAV_ODID_TIME_ACC_1_5_SECOND = 15; /* The timestamp accuracy is smaller than 1.5 second. | */ + public static final int MAV_ODID_TIME_ACC_ENUM_END = 16; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_ODID_UA_TYPE.java b/app/src/main/java/com/MAVLink/enums/MAV_ODID_UA_TYPE.java index 947611b..a2358ed 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_ODID_UA_TYPE.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_ODID_UA_TYPE.java @@ -6,26 +6,26 @@ package com.MAVLink.enums; -/** -* -*/ +/** + * + */ public class MAV_ODID_UA_TYPE { - public static final int MAV_ODID_UA_TYPE_NONE = 0; /* No UA (Unmanned Aircraft) type defined. | */ - public static final int MAV_ODID_UA_TYPE_AEROPLANE = 1; /* Aeroplane/Airplane. Fixed wing. | */ - public static final int MAV_ODID_UA_TYPE_ROTORCRAFT = 2; /* Rotorcraft (including Multirotor). | */ - public static final int MAV_ODID_UA_TYPE_GYROPLANE = 3; /* Gyroplane. | */ - public static final int MAV_ODID_UA_TYPE_VTOL = 4; /* VTOL (Vertical Take-Off and Landing). Fixed wing aircraft that can take off vertically. | */ - public static final int MAV_ODID_UA_TYPE_ORNITHOPTER = 5; /* Ornithopter. | */ - public static final int MAV_ODID_UA_TYPE_GLIDER = 6; /* Glider. | */ - public static final int MAV_ODID_UA_TYPE_KITE = 7; /* Kite. | */ - public static final int MAV_ODID_UA_TYPE_FREE_BALLOON = 8; /* Free Balloon. | */ - public static final int MAV_ODID_UA_TYPE_CAPTIVE_BALLOON = 9; /* Captive Balloon. | */ - public static final int MAV_ODID_UA_TYPE_AIRSHIP = 10; /* Airship. E.g. a blimp. | */ - public static final int MAV_ODID_UA_TYPE_FREE_FALL_PARACHUTE = 11; /* Free Fall/Parachute. | */ - public static final int MAV_ODID_UA_TYPE_ROCKET = 12; /* Rocket. | */ - public static final int MAV_ODID_UA_TYPE_TETHERED_POWERED_AIRCRAFT = 13; /* Tethered powered aircraft. | */ - public static final int MAV_ODID_UA_TYPE_GROUND_OBSTACLE = 14; /* Ground Obstacle. | */ - public static final int MAV_ODID_UA_TYPE_OTHER = 15; /* Other type of aircraft not listed earlier. | */ - public static final int MAV_ODID_UA_TYPE_ENUM_END = 16; /* | */ + public static final int MAV_ODID_UA_TYPE_NONE = 0; /* No UA (Unmanned Aircraft) type defined. | */ + public static final int MAV_ODID_UA_TYPE_AEROPLANE = 1; /* Aeroplane/Airplane. Fixed wing. | */ + public static final int MAV_ODID_UA_TYPE_ROTORCRAFT = 2; /* Rotorcraft (including Multirotor). | */ + public static final int MAV_ODID_UA_TYPE_GYROPLANE = 3; /* Gyroplane. | */ + public static final int MAV_ODID_UA_TYPE_VTOL = 4; /* VTOL (Vertical Take-Off and Landing). Fixed wing aircraft that can take off vertically. | */ + public static final int MAV_ODID_UA_TYPE_ORNITHOPTER = 5; /* Ornithopter. | */ + public static final int MAV_ODID_UA_TYPE_GLIDER = 6; /* Glider. | */ + public static final int MAV_ODID_UA_TYPE_KITE = 7; /* Kite. | */ + public static final int MAV_ODID_UA_TYPE_FREE_BALLOON = 8; /* Free Balloon. | */ + public static final int MAV_ODID_UA_TYPE_CAPTIVE_BALLOON = 9; /* Captive Balloon. | */ + public static final int MAV_ODID_UA_TYPE_AIRSHIP = 10; /* Airship. E.g. a blimp. | */ + public static final int MAV_ODID_UA_TYPE_FREE_FALL_PARACHUTE = 11; /* Free Fall/Parachute. | */ + public static final int MAV_ODID_UA_TYPE_ROCKET = 12; /* Rocket. | */ + public static final int MAV_ODID_UA_TYPE_TETHERED_POWERED_AIRCRAFT = 13; /* Tethered powered aircraft. | */ + public static final int MAV_ODID_UA_TYPE_GROUND_OBSTACLE = 14; /* Ground Obstacle. | */ + public static final int MAV_ODID_UA_TYPE_OTHER = 15; /* Other type of aircraft not listed earlier. | */ + public static final int MAV_ODID_UA_TYPE_ENUM_END = 16; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_ODID_VER_ACC.java b/app/src/main/java/com/MAVLink/enums/MAV_ODID_VER_ACC.java index 6ce3f99..98a8c56 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_ODID_VER_ACC.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_ODID_VER_ACC.java @@ -6,17 +6,17 @@ package com.MAVLink.enums; -/** -* -*/ +/** + * + */ public class MAV_ODID_VER_ACC { - public static final int MAV_ODID_VER_ACC_UNKNOWN = 0; /* The vertical accuracy is unknown. | */ - public static final int MAV_ODID_VER_ACC_150_METER = 1; /* The vertical accuracy is smaller than 150 meter. | */ - public static final int MAV_ODID_VER_ACC_45_METER = 2; /* The vertical accuracy is smaller than 45 meter. | */ - public static final int MAV_ODID_VER_ACC_25_METER = 3; /* The vertical accuracy is smaller than 25 meter. | */ - public static final int MAV_ODID_VER_ACC_10_METER = 4; /* The vertical accuracy is smaller than 10 meter. | */ - public static final int MAV_ODID_VER_ACC_3_METER = 5; /* The vertical accuracy is smaller than 3 meter. | */ - public static final int MAV_ODID_VER_ACC_1_METER = 6; /* The vertical accuracy is smaller than 1 meter. | */ - public static final int MAV_ODID_VER_ACC_ENUM_END = 7; /* | */ + public static final int MAV_ODID_VER_ACC_UNKNOWN = 0; /* The vertical accuracy is unknown. | */ + public static final int MAV_ODID_VER_ACC_150_METER = 1; /* The vertical accuracy is smaller than 150 meter. | */ + public static final int MAV_ODID_VER_ACC_45_METER = 2; /* The vertical accuracy is smaller than 45 meter. | */ + public static final int MAV_ODID_VER_ACC_25_METER = 3; /* The vertical accuracy is smaller than 25 meter. | */ + public static final int MAV_ODID_VER_ACC_10_METER = 4; /* The vertical accuracy is smaller than 10 meter. | */ + public static final int MAV_ODID_VER_ACC_3_METER = 5; /* The vertical accuracy is smaller than 3 meter. | */ + public static final int MAV_ODID_VER_ACC_1_METER = 6; /* The vertical accuracy is smaller than 1 meter. | */ + public static final int MAV_ODID_VER_ACC_ENUM_END = 7; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_PARAM_EXT_TYPE.java b/app/src/main/java/com/MAVLink/enums/MAV_PARAM_EXT_TYPE.java index 8176ed6..9a3e19e 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_PARAM_EXT_TYPE.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_PARAM_EXT_TYPE.java @@ -6,21 +6,21 @@ package com.MAVLink.enums; -/** -* Specifies the datatype of a MAVLink extended parameter. -*/ +/** + * Specifies the datatype of a MAVLink extended parameter. + */ public class MAV_PARAM_EXT_TYPE { - public static final int MAV_PARAM_EXT_TYPE_UINT8 = 1; /* 8-bit unsigned integer | */ - public static final int MAV_PARAM_EXT_TYPE_INT8 = 2; /* 8-bit signed integer | */ - public static final int MAV_PARAM_EXT_TYPE_UINT16 = 3; /* 16-bit unsigned integer | */ - public static final int MAV_PARAM_EXT_TYPE_INT16 = 4; /* 16-bit signed integer | */ - public static final int MAV_PARAM_EXT_TYPE_UINT32 = 5; /* 32-bit unsigned integer | */ - public static final int MAV_PARAM_EXT_TYPE_INT32 = 6; /* 32-bit signed integer | */ - public static final int MAV_PARAM_EXT_TYPE_UINT64 = 7; /* 64-bit unsigned integer | */ - public static final int MAV_PARAM_EXT_TYPE_INT64 = 8; /* 64-bit signed integer | */ - public static final int MAV_PARAM_EXT_TYPE_REAL32 = 9; /* 32-bit floating-point | */ - public static final int MAV_PARAM_EXT_TYPE_REAL64 = 10; /* 64-bit floating-point | */ - public static final int MAV_PARAM_EXT_TYPE_CUSTOM = 11; /* Custom Type | */ - public static final int MAV_PARAM_EXT_TYPE_ENUM_END = 12; /* | */ + public static final int MAV_PARAM_EXT_TYPE_UINT8 = 1; /* 8-bit unsigned integer | */ + public static final int MAV_PARAM_EXT_TYPE_INT8 = 2; /* 8-bit signed integer | */ + public static final int MAV_PARAM_EXT_TYPE_UINT16 = 3; /* 16-bit unsigned integer | */ + public static final int MAV_PARAM_EXT_TYPE_INT16 = 4; /* 16-bit signed integer | */ + public static final int MAV_PARAM_EXT_TYPE_UINT32 = 5; /* 32-bit unsigned integer | */ + public static final int MAV_PARAM_EXT_TYPE_INT32 = 6; /* 32-bit signed integer | */ + public static final int MAV_PARAM_EXT_TYPE_UINT64 = 7; /* 64-bit unsigned integer | */ + public static final int MAV_PARAM_EXT_TYPE_INT64 = 8; /* 64-bit signed integer | */ + public static final int MAV_PARAM_EXT_TYPE_REAL32 = 9; /* 32-bit floating-point | */ + public static final int MAV_PARAM_EXT_TYPE_REAL64 = 10; /* 64-bit floating-point | */ + public static final int MAV_PARAM_EXT_TYPE_CUSTOM = 11; /* Custom Type | */ + public static final int MAV_PARAM_EXT_TYPE_ENUM_END = 12; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_PARAM_TYPE.java b/app/src/main/java/com/MAVLink/enums/MAV_PARAM_TYPE.java index dfca8d6..7a75c08 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_PARAM_TYPE.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_PARAM_TYPE.java @@ -6,20 +6,20 @@ package com.MAVLink.enums; -/** -* Specifies the datatype of a MAVLink parameter. -*/ +/** + * Specifies the datatype of a MAVLink parameter. + */ public class MAV_PARAM_TYPE { - public static final int MAV_PARAM_TYPE_UINT8 = 1; /* 8-bit unsigned integer | */ - public static final int MAV_PARAM_TYPE_INT8 = 2; /* 8-bit signed integer | */ - public static final int MAV_PARAM_TYPE_UINT16 = 3; /* 16-bit unsigned integer | */ - public static final int MAV_PARAM_TYPE_INT16 = 4; /* 16-bit signed integer | */ - public static final int MAV_PARAM_TYPE_UINT32 = 5; /* 32-bit unsigned integer | */ - public static final int MAV_PARAM_TYPE_INT32 = 6; /* 32-bit signed integer | */ - public static final int MAV_PARAM_TYPE_UINT64 = 7; /* 64-bit unsigned integer | */ - public static final int MAV_PARAM_TYPE_INT64 = 8; /* 64-bit signed integer | */ - public static final int MAV_PARAM_TYPE_REAL32 = 9; /* 32-bit floating-point | */ - public static final int MAV_PARAM_TYPE_REAL64 = 10; /* 64-bit floating-point | */ - public static final int MAV_PARAM_TYPE_ENUM_END = 11; /* | */ + public static final int MAV_PARAM_TYPE_UINT8 = 1; /* 8-bit unsigned integer | */ + public static final int MAV_PARAM_TYPE_INT8 = 2; /* 8-bit signed integer | */ + public static final int MAV_PARAM_TYPE_UINT16 = 3; /* 16-bit unsigned integer | */ + public static final int MAV_PARAM_TYPE_INT16 = 4; /* 16-bit signed integer | */ + public static final int MAV_PARAM_TYPE_UINT32 = 5; /* 32-bit unsigned integer | */ + public static final int MAV_PARAM_TYPE_INT32 = 6; /* 32-bit signed integer | */ + public static final int MAV_PARAM_TYPE_UINT64 = 7; /* 64-bit unsigned integer | */ + public static final int MAV_PARAM_TYPE_INT64 = 8; /* 64-bit signed integer | */ + public static final int MAV_PARAM_TYPE_REAL32 = 9; /* 32-bit floating-point | */ + public static final int MAV_PARAM_TYPE_REAL64 = 10; /* 64-bit floating-point | */ + public static final int MAV_PARAM_TYPE_ENUM_END = 11; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_POWER_STATUS.java b/app/src/main/java/com/MAVLink/enums/MAV_POWER_STATUS.java index 2173425..b50ad23 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_POWER_STATUS.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_POWER_STATUS.java @@ -6,16 +6,16 @@ package com.MAVLink.enums; -/** -* Power supply status flags (bitmask) -*/ +/** + * Power supply status flags (bitmask) + */ public class MAV_POWER_STATUS { - public static final int MAV_POWER_STATUS_BRICK_VALID = 1; /* main brick power supply valid | */ - public static final int MAV_POWER_STATUS_SERVO_VALID = 2; /* main servo power supply valid for FMU | */ - public static final int MAV_POWER_STATUS_USB_CONNECTED = 4; /* USB power is connected | */ - public static final int MAV_POWER_STATUS_PERIPH_OVERCURRENT = 8; /* peripheral supply is in over-current state | */ - public static final int MAV_POWER_STATUS_PERIPH_HIPOWER_OVERCURRENT = 16; /* hi-power peripheral supply is in over-current state | */ - public static final int MAV_POWER_STATUS_CHANGED = 32; /* Power status has changed since boot | */ - public static final int MAV_POWER_STATUS_ENUM_END = 33; /* | */ + public static final int MAV_POWER_STATUS_BRICK_VALID = 1; /* main brick power supply valid | */ + public static final int MAV_POWER_STATUS_SERVO_VALID = 2; /* main servo power supply valid for FMU | */ + public static final int MAV_POWER_STATUS_USB_CONNECTED = 4; /* USB power is connected | */ + public static final int MAV_POWER_STATUS_PERIPH_OVERCURRENT = 8; /* peripheral supply is in over-current state | */ + public static final int MAV_POWER_STATUS_PERIPH_HIPOWER_OVERCURRENT = 16; /* hi-power peripheral supply is in over-current state | */ + public static final int MAV_POWER_STATUS_CHANGED = 32; /* Power status has changed since boot | */ + public static final int MAV_POWER_STATUS_ENUM_END = 33; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_PROTOCOL_CAPABILITY.java b/app/src/main/java/com/MAVLink/enums/MAV_PROTOCOL_CAPABILITY.java index 1fdbc51..c8aadc8 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_PROTOCOL_CAPABILITY.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_PROTOCOL_CAPABILITY.java @@ -6,27 +6,27 @@ package com.MAVLink.enums; -/** -* Bitmask of (optional) autopilot capabilities (64 bit). If a bit is set, the autopilot supports this capability. -*/ +/** + * Bitmask of (optional) autopilot capabilities (64 bit). If a bit is set, the autopilot supports this capability. + */ public class MAV_PROTOCOL_CAPABILITY { - public static final int MAV_PROTOCOL_CAPABILITY_MISSION_FLOAT = 1; /* Autopilot supports MISSION float message type. | */ - public static final int MAV_PROTOCOL_CAPABILITY_PARAM_FLOAT = 2; /* Autopilot supports the new param float message type. | */ - public static final int MAV_PROTOCOL_CAPABILITY_MISSION_INT = 4; /* Autopilot supports MISSION_INT scaled integer message type. | */ - public static final int MAV_PROTOCOL_CAPABILITY_COMMAND_INT = 8; /* Autopilot supports COMMAND_INT scaled integer message type. | */ - public static final int MAV_PROTOCOL_CAPABILITY_PARAM_UNION = 16; /* Autopilot supports the new param union message type. | */ - public static final int MAV_PROTOCOL_CAPABILITY_FTP = 32; /* Autopilot supports the new FILE_TRANSFER_PROTOCOL message type. | */ - public static final int MAV_PROTOCOL_CAPABILITY_SET_ATTITUDE_TARGET = 64; /* Autopilot supports commanding attitude offboard. | */ - public static final int MAV_PROTOCOL_CAPABILITY_SET_POSITION_TARGET_LOCAL_NED = 128; /* Autopilot supports commanding position and velocity targets in local NED frame. | */ - public static final int MAV_PROTOCOL_CAPABILITY_SET_POSITION_TARGET_GLOBAL_INT = 256; /* Autopilot supports commanding position and velocity targets in global scaled integers. | */ - public static final int MAV_PROTOCOL_CAPABILITY_TERRAIN = 512; /* Autopilot supports terrain protocol / data handling. | */ - public static final int MAV_PROTOCOL_CAPABILITY_SET_ACTUATOR_TARGET = 1024; /* Autopilot supports direct actuator control. | */ - public static final int MAV_PROTOCOL_CAPABILITY_FLIGHT_TERMINATION = 2048; /* Autopilot supports the flight termination command. | */ - public static final int MAV_PROTOCOL_CAPABILITY_COMPASS_CALIBRATION = 4096; /* Autopilot supports onboard compass calibration. | */ - public static final int MAV_PROTOCOL_CAPABILITY_MAVLINK2 = 8192; /* Autopilot supports MAVLink version 2. | */ - public static final int MAV_PROTOCOL_CAPABILITY_MISSION_FENCE = 16384; /* Autopilot supports mission fence protocol. | */ - public static final int MAV_PROTOCOL_CAPABILITY_MISSION_RALLY = 32768; /* Autopilot supports mission rally point protocol. | */ - public static final int MAV_PROTOCOL_CAPABILITY_FLIGHT_INFORMATION = 65536; /* Autopilot supports the flight information protocol. | */ - public static final int MAV_PROTOCOL_CAPABILITY_ENUM_END = 65537; /* | */ + public static final int MAV_PROTOCOL_CAPABILITY_MISSION_FLOAT = 1; /* Autopilot supports MISSION float message type. | */ + public static final int MAV_PROTOCOL_CAPABILITY_PARAM_FLOAT = 2; /* Autopilot supports the new param float message type. | */ + public static final int MAV_PROTOCOL_CAPABILITY_MISSION_INT = 4; /* Autopilot supports MISSION_INT scaled integer message type. | */ + public static final int MAV_PROTOCOL_CAPABILITY_COMMAND_INT = 8; /* Autopilot supports COMMAND_INT scaled integer message type. | */ + public static final int MAV_PROTOCOL_CAPABILITY_PARAM_UNION = 16; /* Autopilot supports the new param union message type. | */ + public static final int MAV_PROTOCOL_CAPABILITY_FTP = 32; /* Autopilot supports the new FILE_TRANSFER_PROTOCOL message type. | */ + public static final int MAV_PROTOCOL_CAPABILITY_SET_ATTITUDE_TARGET = 64; /* Autopilot supports commanding attitude offboard. | */ + public static final int MAV_PROTOCOL_CAPABILITY_SET_POSITION_TARGET_LOCAL_NED = 128; /* Autopilot supports commanding position and velocity targets in local NED frame. | */ + public static final int MAV_PROTOCOL_CAPABILITY_SET_POSITION_TARGET_GLOBAL_INT = 256; /* Autopilot supports commanding position and velocity targets in global scaled integers. | */ + public static final int MAV_PROTOCOL_CAPABILITY_TERRAIN = 512; /* Autopilot supports terrain protocol / data handling. | */ + public static final int MAV_PROTOCOL_CAPABILITY_SET_ACTUATOR_TARGET = 1024; /* Autopilot supports direct actuator control. | */ + public static final int MAV_PROTOCOL_CAPABILITY_FLIGHT_TERMINATION = 2048; /* Autopilot supports the flight termination command. | */ + public static final int MAV_PROTOCOL_CAPABILITY_COMPASS_CALIBRATION = 4096; /* Autopilot supports onboard compass calibration. | */ + public static final int MAV_PROTOCOL_CAPABILITY_MAVLINK2 = 8192; /* Autopilot supports MAVLink version 2. | */ + public static final int MAV_PROTOCOL_CAPABILITY_MISSION_FENCE = 16384; /* Autopilot supports mission fence protocol. | */ + public static final int MAV_PROTOCOL_CAPABILITY_MISSION_RALLY = 32768; /* Autopilot supports mission rally point protocol. | */ + public static final int MAV_PROTOCOL_CAPABILITY_FLIGHT_INFORMATION = 65536; /* Autopilot supports the flight information protocol. | */ + public static final int MAV_PROTOCOL_CAPABILITY_ENUM_END = 65537; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_REMOTE_LOG_DATA_BLOCK_COMMANDS.java b/app/src/main/java/com/MAVLink/enums/MAV_REMOTE_LOG_DATA_BLOCK_COMMANDS.java index 962f212..1ff2f4a 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_REMOTE_LOG_DATA_BLOCK_COMMANDS.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_REMOTE_LOG_DATA_BLOCK_COMMANDS.java @@ -6,12 +6,12 @@ package com.MAVLink.enums; -/** -* Special ACK block numbers control activation of dataflash log streaming. -*/ +/** + * Special ACK block numbers control activation of dataflash log streaming. + */ public class MAV_REMOTE_LOG_DATA_BLOCK_COMMANDS { - public static final int MAV_REMOTE_LOG_DATA_BLOCK_STOP = 2147483645; /* UAV to stop sending DataFlash blocks. | */ - public static final int MAV_REMOTE_LOG_DATA_BLOCK_START = 2147483646; /* UAV to start sending DataFlash blocks. | */ - public static final int MAV_REMOTE_LOG_DATA_BLOCK_COMMANDS_ENUM_END = 2147483647; /* | */ + public static final int MAV_REMOTE_LOG_DATA_BLOCK_STOP = 2147483645; /* UAV to stop sending DataFlash blocks. | */ + public static final int MAV_REMOTE_LOG_DATA_BLOCK_START = 2147483646; /* UAV to start sending DataFlash blocks. | */ + public static final int MAV_REMOTE_LOG_DATA_BLOCK_COMMANDS_ENUM_END = 2147483647; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_REMOTE_LOG_DATA_BLOCK_STATUSES.java b/app/src/main/java/com/MAVLink/enums/MAV_REMOTE_LOG_DATA_BLOCK_STATUSES.java index 4aa6e9c..d685497 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_REMOTE_LOG_DATA_BLOCK_STATUSES.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_REMOTE_LOG_DATA_BLOCK_STATUSES.java @@ -6,12 +6,12 @@ package com.MAVLink.enums; -/** -* Possible remote log data block statuses. -*/ +/** + * Possible remote log data block statuses. + */ public class MAV_REMOTE_LOG_DATA_BLOCK_STATUSES { - public static final int MAV_REMOTE_LOG_DATA_BLOCK_NACK = 0; /* This block has NOT been received. | */ - public static final int MAV_REMOTE_LOG_DATA_BLOCK_ACK = 1; /* This block has been received. | */ - public static final int MAV_REMOTE_LOG_DATA_BLOCK_STATUSES_ENUM_END = 2; /* | */ + public static final int MAV_REMOTE_LOG_DATA_BLOCK_NACK = 0; /* This block has NOT been received. | */ + public static final int MAV_REMOTE_LOG_DATA_BLOCK_ACK = 1; /* This block has been received. | */ + public static final int MAV_REMOTE_LOG_DATA_BLOCK_STATUSES_ENUM_END = 2; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_RESULT.java b/app/src/main/java/com/MAVLink/enums/MAV_RESULT.java index 21e3bb2..b0121ea 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_RESULT.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_RESULT.java @@ -6,16 +6,16 @@ package com.MAVLink.enums; -/** -* Result from a MAVLink command (MAV_CMD) -*/ +/** + * Result from a MAVLink command (MAV_CMD) + */ public class MAV_RESULT { - public static final int MAV_RESULT_ACCEPTED = 0; /* Command is valid (is supported and has valid parameters), and was executed. | */ - public static final int MAV_RESULT_TEMPORARILY_REJECTED = 1; /* Command is valid, but cannot be executed at this time. This is used to indicate a problem that should be fixed just by waiting (e.g. a state machine is busy, can't arm because have not got GPS lock, etc.). Retrying later should work. | */ - public static final int MAV_RESULT_DENIED = 2; /* Command is invalid (is supported but has invalid parameters). Retrying same command and parameters will not work. | */ - public static final int MAV_RESULT_UNSUPPORTED = 3; /* Command is not supported (unknown). | */ - public static final int MAV_RESULT_FAILED = 4; /* Command is valid, but execution has failed. This is used to indicate any non-temporary or unexpected problem, i.e. any problem that must be fixed before the command can succeed/be retried. For example, attempting to write a file when out of memory, attempting to arm when sensors are not calibrated, etc. | */ - public static final int MAV_RESULT_IN_PROGRESS = 5; /* Command is valid and is being executed. This will be followed by further progress updates, i.e. the component may send further COMMAND_ACK messages with result MAV_RESULT_IN_PROGRESS (at a rate decided by the implementation), and must terminate by sending a COMMAND_ACK message with final result of the operation. The COMMAND_ACK.progress field can be used to indicate the progress of the operation. There is no need for the sender to retry the command, but if done during execution, the component will return MAV_RESULT_IN_PROGRESS with an updated progress. | */ - public static final int MAV_RESULT_ENUM_END = 6; /* | */ + public static final int MAV_RESULT_ACCEPTED = 0; /* Command is valid (is supported and has valid parameters), and was executed. | */ + public static final int MAV_RESULT_TEMPORARILY_REJECTED = 1; /* Command is valid, but cannot be executed at this time. This is used to indicate a problem that should be fixed just by waiting (e.g. a state machine is busy, can't arm because have not got GPS lock, etc.). Retrying later should work. | */ + public static final int MAV_RESULT_DENIED = 2; /* Command is invalid (is supported but has invalid parameters). Retrying same command and parameters will not work. | */ + public static final int MAV_RESULT_UNSUPPORTED = 3; /* Command is not supported (unknown). | */ + public static final int MAV_RESULT_FAILED = 4; /* Command is valid, but execution has failed. This is used to indicate any non-temporary or unexpected problem, i.e. any problem that must be fixed before the command can succeed/be retried. For example, attempting to write a file when out of memory, attempting to arm when sensors are not calibrated, etc. | */ + public static final int MAV_RESULT_IN_PROGRESS = 5; /* Command is valid and is being executed. This will be followed by further progress updates, i.e. the component may send further COMMAND_ACK messages with result MAV_RESULT_IN_PROGRESS (at a rate decided by the implementation), and must terminate by sending a COMMAND_ACK message with final result of the operation. The COMMAND_ACK.progress field can be used to indicate the progress of the operation. There is no need for the sender to retry the command, but if done during execution, the component will return MAV_RESULT_IN_PROGRESS with an updated progress. | */ + public static final int MAV_RESULT_ENUM_END = 6; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_ROI.java b/app/src/main/java/com/MAVLink/enums/MAV_ROI.java index 4fd2960..2f36400 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_ROI.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_ROI.java @@ -6,17 +6,17 @@ package com.MAVLink.enums; -/** -* The ROI (region of interest) for the vehicle. This can be - be used by the vehicle for camera/vehicle attitude alignment (see - MAV_CMD_NAV_ROI). -*/ +/** + * The ROI (region of interest) for the vehicle. This can be + * be used by the vehicle for camera/vehicle attitude alignment (see + * MAV_CMD_NAV_ROI). + */ public class MAV_ROI { - public static final int MAV_ROI_NONE = 0; /* No region of interest. | */ - public static final int MAV_ROI_WPNEXT = 1; /* Point toward next waypoint, with optional pitch/roll/yaw offset. | */ - public static final int MAV_ROI_WPINDEX = 2; /* Point toward given waypoint. | */ - public static final int MAV_ROI_LOCATION = 3; /* Point toward fixed location. | */ - public static final int MAV_ROI_TARGET = 4; /* Point toward of given id. | */ - public static final int MAV_ROI_ENUM_END = 5; /* | */ + public static final int MAV_ROI_NONE = 0; /* No region of interest. | */ + public static final int MAV_ROI_WPNEXT = 1; /* Point toward next waypoint, with optional pitch/roll/yaw offset. | */ + public static final int MAV_ROI_WPINDEX = 2; /* Point toward given waypoint. | */ + public static final int MAV_ROI_LOCATION = 3; /* Point toward fixed location. | */ + public static final int MAV_ROI_TARGET = 4; /* Point toward of given id. | */ + public static final int MAV_ROI_ENUM_END = 5; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_SENSOR_ORIENTATION.java b/app/src/main/java/com/MAVLink/enums/MAV_SENSOR_ORIENTATION.java index ac1937a..01df82c 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_SENSOR_ORIENTATION.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_SENSOR_ORIENTATION.java @@ -6,52 +6,52 @@ package com.MAVLink.enums; -/** -* Enumeration of sensor orientation, according to its rotations -*/ +/** + * Enumeration of sensor orientation, according to its rotations + */ public class MAV_SENSOR_ORIENTATION { - public static final int MAV_SENSOR_ROTATION_NONE = 0; /* Roll: 0, Pitch: 0, Yaw: 0 | */ - public static final int MAV_SENSOR_ROTATION_YAW_45 = 1; /* Roll: 0, Pitch: 0, Yaw: 45 | */ - public static final int MAV_SENSOR_ROTATION_YAW_90 = 2; /* Roll: 0, Pitch: 0, Yaw: 90 | */ - public static final int MAV_SENSOR_ROTATION_YAW_135 = 3; /* Roll: 0, Pitch: 0, Yaw: 135 | */ - public static final int MAV_SENSOR_ROTATION_YAW_180 = 4; /* Roll: 0, Pitch: 0, Yaw: 180 | */ - public static final int MAV_SENSOR_ROTATION_YAW_225 = 5; /* Roll: 0, Pitch: 0, Yaw: 225 | */ - public static final int MAV_SENSOR_ROTATION_YAW_270 = 6; /* Roll: 0, Pitch: 0, Yaw: 270 | */ - public static final int MAV_SENSOR_ROTATION_YAW_315 = 7; /* Roll: 0, Pitch: 0, Yaw: 315 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_180 = 8; /* Roll: 180, Pitch: 0, Yaw: 0 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_180_YAW_45 = 9; /* Roll: 180, Pitch: 0, Yaw: 45 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_180_YAW_90 = 10; /* Roll: 180, Pitch: 0, Yaw: 90 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_180_YAW_135 = 11; /* Roll: 180, Pitch: 0, Yaw: 135 | */ - public static final int MAV_SENSOR_ROTATION_PITCH_180 = 12; /* Roll: 0, Pitch: 180, Yaw: 0 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_180_YAW_225 = 13; /* Roll: 180, Pitch: 0, Yaw: 225 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_180_YAW_270 = 14; /* Roll: 180, Pitch: 0, Yaw: 270 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_180_YAW_315 = 15; /* Roll: 180, Pitch: 0, Yaw: 315 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_90 = 16; /* Roll: 90, Pitch: 0, Yaw: 0 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_90_YAW_45 = 17; /* Roll: 90, Pitch: 0, Yaw: 45 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_90_YAW_90 = 18; /* Roll: 90, Pitch: 0, Yaw: 90 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_90_YAW_135 = 19; /* Roll: 90, Pitch: 0, Yaw: 135 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_270 = 20; /* Roll: 270, Pitch: 0, Yaw: 0 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_270_YAW_45 = 21; /* Roll: 270, Pitch: 0, Yaw: 45 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_270_YAW_90 = 22; /* Roll: 270, Pitch: 0, Yaw: 90 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_270_YAW_135 = 23; /* Roll: 270, Pitch: 0, Yaw: 135 | */ - public static final int MAV_SENSOR_ROTATION_PITCH_90 = 24; /* Roll: 0, Pitch: 90, Yaw: 0 | */ - public static final int MAV_SENSOR_ROTATION_PITCH_270 = 25; /* Roll: 0, Pitch: 270, Yaw: 0 | */ - public static final int MAV_SENSOR_ROTATION_PITCH_180_YAW_90 = 26; /* Roll: 0, Pitch: 180, Yaw: 90 | */ - public static final int MAV_SENSOR_ROTATION_PITCH_180_YAW_270 = 27; /* Roll: 0, Pitch: 180, Yaw: 270 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_90_PITCH_90 = 28; /* Roll: 90, Pitch: 90, Yaw: 0 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_180_PITCH_90 = 29; /* Roll: 180, Pitch: 90, Yaw: 0 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_270_PITCH_90 = 30; /* Roll: 270, Pitch: 90, Yaw: 0 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_90_PITCH_180 = 31; /* Roll: 90, Pitch: 180, Yaw: 0 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_270_PITCH_180 = 32; /* Roll: 270, Pitch: 180, Yaw: 0 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_90_PITCH_270 = 33; /* Roll: 90, Pitch: 270, Yaw: 0 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_180_PITCH_270 = 34; /* Roll: 180, Pitch: 270, Yaw: 0 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_270_PITCH_270 = 35; /* Roll: 270, Pitch: 270, Yaw: 0 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_90_PITCH_180_YAW_90 = 36; /* Roll: 90, Pitch: 180, Yaw: 90 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_90_YAW_270 = 37; /* Roll: 90, Pitch: 0, Yaw: 270 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_90_PITCH_68_YAW_293 = 38; /* Roll: 90, Pitch: 68, Yaw: 293 | */ - public static final int MAV_SENSOR_ROTATION_PITCH_315 = 39; /* Pitch: 315 | */ - public static final int MAV_SENSOR_ROTATION_ROLL_90_PITCH_315 = 40; /* Roll: 90, Pitch: 315 | */ - public static final int MAV_SENSOR_ROTATION_CUSTOM = 100; /* Custom orientation | */ - public static final int MAV_SENSOR_ORIENTATION_ENUM_END = 101; /* | */ + public static final int MAV_SENSOR_ROTATION_NONE = 0; /* Roll: 0, Pitch: 0, Yaw: 0 | */ + public static final int MAV_SENSOR_ROTATION_YAW_45 = 1; /* Roll: 0, Pitch: 0, Yaw: 45 | */ + public static final int MAV_SENSOR_ROTATION_YAW_90 = 2; /* Roll: 0, Pitch: 0, Yaw: 90 | */ + public static final int MAV_SENSOR_ROTATION_YAW_135 = 3; /* Roll: 0, Pitch: 0, Yaw: 135 | */ + public static final int MAV_SENSOR_ROTATION_YAW_180 = 4; /* Roll: 0, Pitch: 0, Yaw: 180 | */ + public static final int MAV_SENSOR_ROTATION_YAW_225 = 5; /* Roll: 0, Pitch: 0, Yaw: 225 | */ + public static final int MAV_SENSOR_ROTATION_YAW_270 = 6; /* Roll: 0, Pitch: 0, Yaw: 270 | */ + public static final int MAV_SENSOR_ROTATION_YAW_315 = 7; /* Roll: 0, Pitch: 0, Yaw: 315 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_180 = 8; /* Roll: 180, Pitch: 0, Yaw: 0 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_180_YAW_45 = 9; /* Roll: 180, Pitch: 0, Yaw: 45 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_180_YAW_90 = 10; /* Roll: 180, Pitch: 0, Yaw: 90 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_180_YAW_135 = 11; /* Roll: 180, Pitch: 0, Yaw: 135 | */ + public static final int MAV_SENSOR_ROTATION_PITCH_180 = 12; /* Roll: 0, Pitch: 180, Yaw: 0 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_180_YAW_225 = 13; /* Roll: 180, Pitch: 0, Yaw: 225 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_180_YAW_270 = 14; /* Roll: 180, Pitch: 0, Yaw: 270 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_180_YAW_315 = 15; /* Roll: 180, Pitch: 0, Yaw: 315 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_90 = 16; /* Roll: 90, Pitch: 0, Yaw: 0 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_90_YAW_45 = 17; /* Roll: 90, Pitch: 0, Yaw: 45 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_90_YAW_90 = 18; /* Roll: 90, Pitch: 0, Yaw: 90 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_90_YAW_135 = 19; /* Roll: 90, Pitch: 0, Yaw: 135 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_270 = 20; /* Roll: 270, Pitch: 0, Yaw: 0 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_270_YAW_45 = 21; /* Roll: 270, Pitch: 0, Yaw: 45 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_270_YAW_90 = 22; /* Roll: 270, Pitch: 0, Yaw: 90 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_270_YAW_135 = 23; /* Roll: 270, Pitch: 0, Yaw: 135 | */ + public static final int MAV_SENSOR_ROTATION_PITCH_90 = 24; /* Roll: 0, Pitch: 90, Yaw: 0 | */ + public static final int MAV_SENSOR_ROTATION_PITCH_270 = 25; /* Roll: 0, Pitch: 270, Yaw: 0 | */ + public static final int MAV_SENSOR_ROTATION_PITCH_180_YAW_90 = 26; /* Roll: 0, Pitch: 180, Yaw: 90 | */ + public static final int MAV_SENSOR_ROTATION_PITCH_180_YAW_270 = 27; /* Roll: 0, Pitch: 180, Yaw: 270 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_90_PITCH_90 = 28; /* Roll: 90, Pitch: 90, Yaw: 0 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_180_PITCH_90 = 29; /* Roll: 180, Pitch: 90, Yaw: 0 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_270_PITCH_90 = 30; /* Roll: 270, Pitch: 90, Yaw: 0 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_90_PITCH_180 = 31; /* Roll: 90, Pitch: 180, Yaw: 0 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_270_PITCH_180 = 32; /* Roll: 270, Pitch: 180, Yaw: 0 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_90_PITCH_270 = 33; /* Roll: 90, Pitch: 270, Yaw: 0 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_180_PITCH_270 = 34; /* Roll: 180, Pitch: 270, Yaw: 0 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_270_PITCH_270 = 35; /* Roll: 270, Pitch: 270, Yaw: 0 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_90_PITCH_180_YAW_90 = 36; /* Roll: 90, Pitch: 180, Yaw: 90 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_90_YAW_270 = 37; /* Roll: 90, Pitch: 0, Yaw: 270 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_90_PITCH_68_YAW_293 = 38; /* Roll: 90, Pitch: 68, Yaw: 293 | */ + public static final int MAV_SENSOR_ROTATION_PITCH_315 = 39; /* Pitch: 315 | */ + public static final int MAV_SENSOR_ROTATION_ROLL_90_PITCH_315 = 40; /* Roll: 90, Pitch: 315 | */ + public static final int MAV_SENSOR_ROTATION_CUSTOM = 100; /* Custom orientation | */ + public static final int MAV_SENSOR_ORIENTATION_ENUM_END = 101; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_SEVERITY.java b/app/src/main/java/com/MAVLink/enums/MAV_SEVERITY.java index 30121f9..0dcccbc 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_SEVERITY.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_SEVERITY.java @@ -6,18 +6,18 @@ package com.MAVLink.enums; -/** -* Indicates the severity level, generally used for status messages to indicate their relative urgency. Based on RFC-5424 using expanded definitions at: http://www.kiwisyslog.com/kb/info:-syslog-message-levels/. -*/ +/** + * Indicates the severity level, generally used for status messages to indicate their relative urgency. Based on RFC-5424 using expanded definitions at: http://www.kiwisyslog.com/kb/info:-syslog-message-levels/. + */ public class MAV_SEVERITY { - public static final int MAV_SEVERITY_EMERGENCY = 0; /* System is unusable. This is a "panic" condition. | */ - public static final int MAV_SEVERITY_ALERT = 1; /* Action should be taken immediately. Indicates error in non-critical systems. | */ - public static final int MAV_SEVERITY_CRITICAL = 2; /* Action must be taken immediately. Indicates failure in a primary system. | */ - public static final int MAV_SEVERITY_ERROR = 3; /* Indicates an error in secondary/redundant systems. | */ - public static final int MAV_SEVERITY_WARNING = 4; /* Indicates about a possible future error if this is not resolved within a given timeframe. Example would be a low battery warning. | */ - public static final int MAV_SEVERITY_NOTICE = 5; /* An unusual event has occurred, though not an error condition. This should be investigated for the root cause. | */ - public static final int MAV_SEVERITY_INFO = 6; /* Normal operational messages. Useful for logging. No action is required for these messages. | */ - public static final int MAV_SEVERITY_DEBUG = 7; /* Useful non-operational messages that can assist in debugging. These should not occur during normal operation. | */ - public static final int MAV_SEVERITY_ENUM_END = 8; /* | */ + public static final int MAV_SEVERITY_EMERGENCY = 0; /* System is unusable. This is a "panic" condition. | */ + public static final int MAV_SEVERITY_ALERT = 1; /* Action should be taken immediately. Indicates error in non-critical systems. | */ + public static final int MAV_SEVERITY_CRITICAL = 2; /* Action must be taken immediately. Indicates failure in a primary system. | */ + public static final int MAV_SEVERITY_ERROR = 3; /* Indicates an error in secondary/redundant systems. | */ + public static final int MAV_SEVERITY_WARNING = 4; /* Indicates about a possible future error if this is not resolved within a given timeframe. Example would be a low battery warning. | */ + public static final int MAV_SEVERITY_NOTICE = 5; /* An unusual event has occurred, though not an error condition. This should be investigated for the root cause. | */ + public static final int MAV_SEVERITY_INFO = 6; /* Normal operational messages. Useful for logging. No action is required for these messages. | */ + public static final int MAV_SEVERITY_DEBUG = 7; /* Useful non-operational messages that can assist in debugging. These should not occur during normal operation. | */ + public static final int MAV_SEVERITY_ENUM_END = 8; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_SMART_BATTERY_FAULT.java b/app/src/main/java/com/MAVLink/enums/MAV_SMART_BATTERY_FAULT.java index c3728b1..555b75c 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_SMART_BATTERY_FAULT.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_SMART_BATTERY_FAULT.java @@ -6,16 +6,16 @@ package com.MAVLink.enums; -/** -* Smart battery supply status/fault flags (bitmask) for health indication. -*/ +/** + * Smart battery supply status/fault flags (bitmask) for health indication. + */ public class MAV_SMART_BATTERY_FAULT { - public static final int MAV_SMART_BATTERY_FAULT_DEEP_DISCHARGE = 1; /* Battery has deep discharged. | */ - public static final int MAV_SMART_BATTERY_FAULT_SPIKES = 2; /* Voltage spikes. | */ - public static final int MAV_SMART_BATTERY_FAULT_SINGLE_CELL_FAIL = 4; /* Single cell has failed. | */ - public static final int MAV_SMART_BATTERY_FAULT_OVER_CURRENT = 8; /* Over-current fault. | */ - public static final int MAV_SMART_BATTERY_FAULT_OVER_TEMPERATURE = 16; /* Over-temperature fault. | */ - public static final int MAV_SMART_BATTERY_FAULT_UNDER_TEMPERATURE = 32; /* Under-temperature fault. | */ - public static final int MAV_SMART_BATTERY_FAULT_ENUM_END = 33; /* | */ + public static final int MAV_SMART_BATTERY_FAULT_DEEP_DISCHARGE = 1; /* Battery has deep discharged. | */ + public static final int MAV_SMART_BATTERY_FAULT_SPIKES = 2; /* Voltage spikes. | */ + public static final int MAV_SMART_BATTERY_FAULT_SINGLE_CELL_FAIL = 4; /* Single cell has failed. | */ + public static final int MAV_SMART_BATTERY_FAULT_OVER_CURRENT = 8; /* Over-current fault. | */ + public static final int MAV_SMART_BATTERY_FAULT_OVER_TEMPERATURE = 16; /* Over-temperature fault. | */ + public static final int MAV_SMART_BATTERY_FAULT_UNDER_TEMPERATURE = 32; /* Under-temperature fault. | */ + public static final int MAV_SMART_BATTERY_FAULT_ENUM_END = 33; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_STATE.java b/app/src/main/java/com/MAVLink/enums/MAV_STATE.java index b0c42de..563f60b 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_STATE.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_STATE.java @@ -6,19 +6,19 @@ package com.MAVLink.enums; -/** -* -*/ +/** + * + */ public class MAV_STATE { - public static final int MAV_STATE_UNINIT = 0; /* Uninitialized system, state is unknown. | */ - public static final int MAV_STATE_BOOT = 1; /* System is booting up. | */ - public static final int MAV_STATE_CALIBRATING = 2; /* System is calibrating and not flight-ready. | */ - public static final int MAV_STATE_STANDBY = 3; /* System is grounded and on standby. It can be launched any time. | */ - public static final int MAV_STATE_ACTIVE = 4; /* System is active and might be already airborne. Motors are engaged. | */ - public static final int MAV_STATE_CRITICAL = 5; /* System is in a non-normal flight mode. It can however still navigate. | */ - public static final int MAV_STATE_EMERGENCY = 6; /* System is in a non-normal flight mode. It lost control over parts or over the whole airframe. It is in mayday and going down. | */ - public static final int MAV_STATE_POWEROFF = 7; /* System just initialized its power-down sequence, will shut down now. | */ - public static final int MAV_STATE_FLIGHT_TERMINATION = 8; /* System is terminating itself. | */ - public static final int MAV_STATE_ENUM_END = 9; /* | */ + public static final int MAV_STATE_UNINIT = 0; /* Uninitialized system, state is unknown. | */ + public static final int MAV_STATE_BOOT = 1; /* System is booting up. | */ + public static final int MAV_STATE_CALIBRATING = 2; /* System is calibrating and not flight-ready. | */ + public static final int MAV_STATE_STANDBY = 3; /* System is grounded and on standby. It can be launched any time. | */ + public static final int MAV_STATE_ACTIVE = 4; /* System is active and might be already airborne. Motors are engaged. | */ + public static final int MAV_STATE_CRITICAL = 5; /* System is in a non-normal flight mode. It can however still navigate. | */ + public static final int MAV_STATE_EMERGENCY = 6; /* System is in a non-normal flight mode. It lost control over parts or over the whole airframe. It is in mayday and going down. | */ + public static final int MAV_STATE_POWEROFF = 7; /* System just initialized its power-down sequence, will shut down now. | */ + public static final int MAV_STATE_FLIGHT_TERMINATION = 8; /* System is terminating itself. | */ + public static final int MAV_STATE_ENUM_END = 9; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_SYS_STATUS_SENSOR.java b/app/src/main/java/com/MAVLink/enums/MAV_SYS_STATUS_SENSOR.java index 965339b..945f512 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_SYS_STATUS_SENSOR.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_SYS_STATUS_SENSOR.java @@ -6,39 +6,39 @@ package com.MAVLink.enums; -/** -* These encode the sensors whose status is sent as part of the SYS_STATUS message. -*/ +/** + * These encode the sensors whose status is sent as part of the SYS_STATUS message. + */ public class MAV_SYS_STATUS_SENSOR { - public static final int MAV_SYS_STATUS_SENSOR_3D_GYRO = 1; /* 0x01 3D gyro | */ - public static final int MAV_SYS_STATUS_SENSOR_3D_ACCEL = 2; /* 0x02 3D accelerometer | */ - public static final int MAV_SYS_STATUS_SENSOR_3D_MAG = 4; /* 0x04 3D magnetometer | */ - public static final int MAV_SYS_STATUS_SENSOR_ABSOLUTE_PRESSURE = 8; /* 0x08 absolute pressure | */ - public static final int MAV_SYS_STATUS_SENSOR_DIFFERENTIAL_PRESSURE = 16; /* 0x10 differential pressure | */ - public static final int MAV_SYS_STATUS_SENSOR_GPS = 32; /* 0x20 GPS | */ - public static final int MAV_SYS_STATUS_SENSOR_OPTICAL_FLOW = 64; /* 0x40 optical flow | */ - public static final int MAV_SYS_STATUS_SENSOR_VISION_POSITION = 128; /* 0x80 computer vision position | */ - public static final int MAV_SYS_STATUS_SENSOR_LASER_POSITION = 256; /* 0x100 laser based position | */ - public static final int MAV_SYS_STATUS_SENSOR_EXTERNAL_GROUND_TRUTH = 512; /* 0x200 external ground truth (Vicon or Leica) | */ - public static final int MAV_SYS_STATUS_SENSOR_ANGULAR_RATE_CONTROL = 1024; /* 0x400 3D angular rate control | */ - public static final int MAV_SYS_STATUS_SENSOR_ATTITUDE_STABILIZATION = 2048; /* 0x800 attitude stabilization | */ - public static final int MAV_SYS_STATUS_SENSOR_YAW_POSITION = 4096; /* 0x1000 yaw position | */ - public static final int MAV_SYS_STATUS_SENSOR_Z_ALTITUDE_CONTROL = 8192; /* 0x2000 z/altitude control | */ - public static final int MAV_SYS_STATUS_SENSOR_XY_POSITION_CONTROL = 16384; /* 0x4000 x/y position control | */ - public static final int MAV_SYS_STATUS_SENSOR_MOTOR_OUTPUTS = 32768; /* 0x8000 motor outputs / control | */ - public static final int MAV_SYS_STATUS_SENSOR_RC_RECEIVER = 65536; /* 0x10000 rc receiver | */ - public static final int MAV_SYS_STATUS_SENSOR_3D_GYRO2 = 131072; /* 0x20000 2nd 3D gyro | */ - public static final int MAV_SYS_STATUS_SENSOR_3D_ACCEL2 = 262144; /* 0x40000 2nd 3D accelerometer | */ - public static final int MAV_SYS_STATUS_SENSOR_3D_MAG2 = 524288; /* 0x80000 2nd 3D magnetometer | */ - public static final int MAV_SYS_STATUS_GEOFENCE = 1048576; /* 0x100000 geofence | */ - public static final int MAV_SYS_STATUS_AHRS = 2097152; /* 0x200000 AHRS subsystem health | */ - public static final int MAV_SYS_STATUS_TERRAIN = 4194304; /* 0x400000 Terrain subsystem health | */ - public static final int MAV_SYS_STATUS_REVERSE_MOTOR = 8388608; /* 0x800000 Motors are reversed | */ - public static final int MAV_SYS_STATUS_LOGGING = 16777216; /* 0x1000000 Logging | */ - public static final int MAV_SYS_STATUS_SENSOR_BATTERY = 33554432; /* 0x2000000 Battery | */ - public static final int MAV_SYS_STATUS_SENSOR_PROXIMITY = 67108864; /* 0x4000000 Proximity | */ - public static final int MAV_SYS_STATUS_SENSOR_SATCOM = 134217728; /* 0x8000000 Satellite Communication | */ - public static final int MAV_SYS_STATUS_PREARM_CHECK = 268435456; /* 0x10000000 pre-arm check status. Always healthy when armed | */ - public static final int MAV_SYS_STATUS_SENSOR_ENUM_END = 268435457; /* | */ + public static final int MAV_SYS_STATUS_SENSOR_3D_GYRO = 1; /* 0x01 3D gyro | */ + public static final int MAV_SYS_STATUS_SENSOR_3D_ACCEL = 2; /* 0x02 3D accelerometer | */ + public static final int MAV_SYS_STATUS_SENSOR_3D_MAG = 4; /* 0x04 3D magnetometer | */ + public static final int MAV_SYS_STATUS_SENSOR_ABSOLUTE_PRESSURE = 8; /* 0x08 absolute pressure | */ + public static final int MAV_SYS_STATUS_SENSOR_DIFFERENTIAL_PRESSURE = 16; /* 0x10 differential pressure | */ + public static final int MAV_SYS_STATUS_SENSOR_GPS = 32; /* 0x20 GPS | */ + public static final int MAV_SYS_STATUS_SENSOR_OPTICAL_FLOW = 64; /* 0x40 optical flow | */ + public static final int MAV_SYS_STATUS_SENSOR_VISION_POSITION = 128; /* 0x80 computer vision position | */ + public static final int MAV_SYS_STATUS_SENSOR_LASER_POSITION = 256; /* 0x100 laser based position | */ + public static final int MAV_SYS_STATUS_SENSOR_EXTERNAL_GROUND_TRUTH = 512; /* 0x200 external ground truth (Vicon or Leica) | */ + public static final int MAV_SYS_STATUS_SENSOR_ANGULAR_RATE_CONTROL = 1024; /* 0x400 3D angular rate control | */ + public static final int MAV_SYS_STATUS_SENSOR_ATTITUDE_STABILIZATION = 2048; /* 0x800 attitude stabilization | */ + public static final int MAV_SYS_STATUS_SENSOR_YAW_POSITION = 4096; /* 0x1000 yaw position | */ + public static final int MAV_SYS_STATUS_SENSOR_Z_ALTITUDE_CONTROL = 8192; /* 0x2000 z/altitude control | */ + public static final int MAV_SYS_STATUS_SENSOR_XY_POSITION_CONTROL = 16384; /* 0x4000 x/y position control | */ + public static final int MAV_SYS_STATUS_SENSOR_MOTOR_OUTPUTS = 32768; /* 0x8000 motor outputs / control | */ + public static final int MAV_SYS_STATUS_SENSOR_RC_RECEIVER = 65536; /* 0x10000 rc receiver | */ + public static final int MAV_SYS_STATUS_SENSOR_3D_GYRO2 = 131072; /* 0x20000 2nd 3D gyro | */ + public static final int MAV_SYS_STATUS_SENSOR_3D_ACCEL2 = 262144; /* 0x40000 2nd 3D accelerometer | */ + public static final int MAV_SYS_STATUS_SENSOR_3D_MAG2 = 524288; /* 0x80000 2nd 3D magnetometer | */ + public static final int MAV_SYS_STATUS_GEOFENCE = 1048576; /* 0x100000 geofence | */ + public static final int MAV_SYS_STATUS_AHRS = 2097152; /* 0x200000 AHRS subsystem health | */ + public static final int MAV_SYS_STATUS_TERRAIN = 4194304; /* 0x400000 Terrain subsystem health | */ + public static final int MAV_SYS_STATUS_REVERSE_MOTOR = 8388608; /* 0x800000 Motors are reversed | */ + public static final int MAV_SYS_STATUS_LOGGING = 16777216; /* 0x1000000 Logging | */ + public static final int MAV_SYS_STATUS_SENSOR_BATTERY = 33554432; /* 0x2000000 Battery | */ + public static final int MAV_SYS_STATUS_SENSOR_PROXIMITY = 67108864; /* 0x4000000 Proximity | */ + public static final int MAV_SYS_STATUS_SENSOR_SATCOM = 134217728; /* 0x8000000 Satellite Communication | */ + public static final int MAV_SYS_STATUS_PREARM_CHECK = 268435456; /* 0x10000000 pre-arm check status. Always healthy when armed | */ + public static final int MAV_SYS_STATUS_SENSOR_ENUM_END = 268435457; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_TUNNEL_PAYLOAD_TYPE.java b/app/src/main/java/com/MAVLink/enums/MAV_TUNNEL_PAYLOAD_TYPE.java index eb91788..cf0b53c 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_TUNNEL_PAYLOAD_TYPE.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_TUNNEL_PAYLOAD_TYPE.java @@ -6,21 +6,21 @@ package com.MAVLink.enums; -/** -* -*/ +/** + * + */ public class MAV_TUNNEL_PAYLOAD_TYPE { - public static final int MAV_TUNNEL_PAYLOAD_TYPE_UNKNOWN = 0; /* Encoding of payload unknown. | */ - public static final int MAV_TUNNEL_PAYLOAD_TYPE_STORM32_RESERVED0 = 200; /* Registered for STorM32 gimbal controller. | */ - public static final int MAV_TUNNEL_PAYLOAD_TYPE_STORM32_RESERVED1 = 201; /* Registered for STorM32 gimbal controller. | */ - public static final int MAV_TUNNEL_PAYLOAD_TYPE_STORM32_RESERVED2 = 202; /* Registered for STorM32 gimbal controller. | */ - public static final int MAV_TUNNEL_PAYLOAD_TYPE_STORM32_RESERVED3 = 203; /* Registered for STorM32 gimbal controller. | */ - public static final int MAV_TUNNEL_PAYLOAD_TYPE_STORM32_RESERVED4 = 204; /* Registered for STorM32 gimbal controller. | */ - public static final int MAV_TUNNEL_PAYLOAD_TYPE_STORM32_RESERVED5 = 205; /* Registered for STorM32 gimbal controller. | */ - public static final int MAV_TUNNEL_PAYLOAD_TYPE_STORM32_RESERVED6 = 206; /* Registered for STorM32 gimbal controller. | */ - public static final int MAV_TUNNEL_PAYLOAD_TYPE_STORM32_RESERVED7 = 207; /* Registered for STorM32 gimbal controller. | */ - public static final int MAV_TUNNEL_PAYLOAD_TYPE_STORM32_RESERVED8 = 208; /* Registered for STorM32 gimbal controller. | */ - public static final int MAV_TUNNEL_PAYLOAD_TYPE_STORM32_RESERVED9 = 209; /* Registered for STorM32 gimbal controller. | */ - public static final int MAV_TUNNEL_PAYLOAD_TYPE_ENUM_END = 210; /* | */ + public static final int MAV_TUNNEL_PAYLOAD_TYPE_UNKNOWN = 0; /* Encoding of payload unknown. | */ + public static final int MAV_TUNNEL_PAYLOAD_TYPE_STORM32_RESERVED0 = 200; /* Registered for STorM32 gimbal controller. | */ + public static final int MAV_TUNNEL_PAYLOAD_TYPE_STORM32_RESERVED1 = 201; /* Registered for STorM32 gimbal controller. | */ + public static final int MAV_TUNNEL_PAYLOAD_TYPE_STORM32_RESERVED2 = 202; /* Registered for STorM32 gimbal controller. | */ + public static final int MAV_TUNNEL_PAYLOAD_TYPE_STORM32_RESERVED3 = 203; /* Registered for STorM32 gimbal controller. | */ + public static final int MAV_TUNNEL_PAYLOAD_TYPE_STORM32_RESERVED4 = 204; /* Registered for STorM32 gimbal controller. | */ + public static final int MAV_TUNNEL_PAYLOAD_TYPE_STORM32_RESERVED5 = 205; /* Registered for STorM32 gimbal controller. | */ + public static final int MAV_TUNNEL_PAYLOAD_TYPE_STORM32_RESERVED6 = 206; /* Registered for STorM32 gimbal controller. | */ + public static final int MAV_TUNNEL_PAYLOAD_TYPE_STORM32_RESERVED7 = 207; /* Registered for STorM32 gimbal controller. | */ + public static final int MAV_TUNNEL_PAYLOAD_TYPE_STORM32_RESERVED8 = 208; /* Registered for STorM32 gimbal controller. | */ + public static final int MAV_TUNNEL_PAYLOAD_TYPE_STORM32_RESERVED9 = 209; /* Registered for STorM32 gimbal controller. | */ + public static final int MAV_TUNNEL_PAYLOAD_TYPE_ENUM_END = 210; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_TYPE.java b/app/src/main/java/com/MAVLink/enums/MAV_TYPE.java index 77197a5..070f6c4 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_TYPE.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_TYPE.java @@ -6,44 +6,44 @@ package com.MAVLink.enums; -/** -* MAVLINK component type reported in HEARTBEAT message. Flight controllers must report the type of the vehicle on which they are mounted (e.g. MAV_TYPE_OCTOROTOR). All other components must report a value appropriate for their type (e.g. a camera must use MAV_TYPE_CAMERA). -*/ +/** + * MAVLINK component type reported in HEARTBEAT message. Flight controllers must report the type of the vehicle on which they are mounted (e.g. MAV_TYPE_OCTOROTOR). All other components must report a value appropriate for their type (e.g. a camera must use MAV_TYPE_CAMERA). + */ public class MAV_TYPE { - public static final int MAV_TYPE_GENERIC = 0; /* Generic micro air vehicle | */ - public static final int MAV_TYPE_FIXED_WING = 1; /* Fixed wing aircraft. | */ - public static final int MAV_TYPE_QUADROTOR = 2; /* Quadrotor | */ - public static final int MAV_TYPE_COAXIAL = 3; /* Coaxial helicopter | */ - public static final int MAV_TYPE_HELICOPTER = 4; /* Normal helicopter with tail rotor. | */ - public static final int MAV_TYPE_ANTENNA_TRACKER = 5; /* Ground installation | */ - public static final int MAV_TYPE_GCS = 6; /* Operator control unit / ground control station | */ - public static final int MAV_TYPE_AIRSHIP = 7; /* Airship, controlled | */ - public static final int MAV_TYPE_FREE_BALLOON = 8; /* Free balloon, uncontrolled | */ - public static final int MAV_TYPE_ROCKET = 9; /* Rocket | */ - public static final int MAV_TYPE_GROUND_ROVER = 10; /* Ground rover | */ - public static final int MAV_TYPE_SURFACE_BOAT = 11; /* Surface vessel, boat, ship | */ - public static final int MAV_TYPE_SUBMARINE = 12; /* Submarine | */ - public static final int MAV_TYPE_HEXAROTOR = 13; /* Hexarotor | */ - public static final int MAV_TYPE_OCTOROTOR = 14; /* Octorotor | */ - public static final int MAV_TYPE_TRICOPTER = 15; /* Tricopter | */ - public static final int MAV_TYPE_FLAPPING_WING = 16; /* Flapping wing | */ - public static final int MAV_TYPE_KITE = 17; /* Kite | */ - public static final int MAV_TYPE_ONBOARD_CONTROLLER = 18; /* Onboard companion controller | */ - public static final int MAV_TYPE_VTOL_DUOROTOR = 19; /* Two-rotor VTOL using control surfaces in vertical operation in addition. Tailsitter. | */ - public static final int MAV_TYPE_VTOL_QUADROTOR = 20; /* Quad-rotor VTOL using a V-shaped quad config in vertical operation. Tailsitter. | */ - public static final int MAV_TYPE_VTOL_TILTROTOR = 21; /* Tiltrotor VTOL | */ - public static final int MAV_TYPE_VTOL_RESERVED2 = 22; /* VTOL reserved 2 | */ - public static final int MAV_TYPE_VTOL_RESERVED3 = 23; /* VTOL reserved 3 | */ - public static final int MAV_TYPE_VTOL_RESERVED4 = 24; /* VTOL reserved 4 | */ - public static final int MAV_TYPE_VTOL_RESERVED5 = 25; /* VTOL reserved 5 | */ - public static final int MAV_TYPE_GIMBAL = 26; /* Gimbal | */ - public static final int MAV_TYPE_ADSB = 27; /* ADSB system | */ - public static final int MAV_TYPE_PARAFOIL = 28; /* Steerable, nonrigid airfoil | */ - public static final int MAV_TYPE_DODECAROTOR = 29; /* Dodecarotor | */ - public static final int MAV_TYPE_CAMERA = 30; /* Camera | */ - public static final int MAV_TYPE_CHARGING_STATION = 31; /* Charging station | */ - public static final int MAV_TYPE_FLARM = 32; /* FLARM collision avoidance system | */ - public static final int MAV_TYPE_SERVO = 33; /* Servo | */ - public static final int MAV_TYPE_ENUM_END = 34; /* | */ + public static final int MAV_TYPE_GENERIC = 0; /* Generic micro air vehicle | */ + public static final int MAV_TYPE_FIXED_WING = 1; /* Fixed wing aircraft. | */ + public static final int MAV_TYPE_QUADROTOR = 2; /* Quadrotor | */ + public static final int MAV_TYPE_COAXIAL = 3; /* Coaxial helicopter | */ + public static final int MAV_TYPE_HELICOPTER = 4; /* Normal helicopter with tail rotor. | */ + public static final int MAV_TYPE_ANTENNA_TRACKER = 5; /* Ground installation | */ + public static final int MAV_TYPE_GCS = 6; /* Operator control unit / ground control station | */ + public static final int MAV_TYPE_AIRSHIP = 7; /* Airship, controlled | */ + public static final int MAV_TYPE_FREE_BALLOON = 8; /* Free balloon, uncontrolled | */ + public static final int MAV_TYPE_ROCKET = 9; /* Rocket | */ + public static final int MAV_TYPE_GROUND_ROVER = 10; /* Ground rover | */ + public static final int MAV_TYPE_SURFACE_BOAT = 11; /* Surface vessel, boat, ship | */ + public static final int MAV_TYPE_SUBMARINE = 12; /* Submarine | */ + public static final int MAV_TYPE_HEXAROTOR = 13; /* Hexarotor | */ + public static final int MAV_TYPE_OCTOROTOR = 14; /* Octorotor | */ + public static final int MAV_TYPE_TRICOPTER = 15; /* Tricopter | */ + public static final int MAV_TYPE_FLAPPING_WING = 16; /* Flapping wing | */ + public static final int MAV_TYPE_KITE = 17; /* Kite | */ + public static final int MAV_TYPE_ONBOARD_CONTROLLER = 18; /* Onboard companion controller | */ + public static final int MAV_TYPE_VTOL_DUOROTOR = 19; /* Two-rotor VTOL using control surfaces in vertical operation in addition. Tailsitter. | */ + public static final int MAV_TYPE_VTOL_QUADROTOR = 20; /* Quad-rotor VTOL using a V-shaped quad config in vertical operation. Tailsitter. | */ + public static final int MAV_TYPE_VTOL_TILTROTOR = 21; /* Tiltrotor VTOL | */ + public static final int MAV_TYPE_VTOL_RESERVED2 = 22; /* VTOL reserved 2 | */ + public static final int MAV_TYPE_VTOL_RESERVED3 = 23; /* VTOL reserved 3 | */ + public static final int MAV_TYPE_VTOL_RESERVED4 = 24; /* VTOL reserved 4 | */ + public static final int MAV_TYPE_VTOL_RESERVED5 = 25; /* VTOL reserved 5 | */ + public static final int MAV_TYPE_GIMBAL = 26; /* Gimbal | */ + public static final int MAV_TYPE_ADSB = 27; /* ADSB system | */ + public static final int MAV_TYPE_PARAFOIL = 28; /* Steerable, nonrigid airfoil | */ + public static final int MAV_TYPE_DODECAROTOR = 29; /* Dodecarotor | */ + public static final int MAV_TYPE_CAMERA = 30; /* Camera | */ + public static final int MAV_TYPE_CHARGING_STATION = 31; /* Charging station | */ + public static final int MAV_TYPE_FLARM = 32; /* FLARM collision avoidance system | */ + public static final int MAV_TYPE_SERVO = 33; /* Servo | */ + public static final int MAV_TYPE_ENUM_END = 34; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MAV_VTOL_STATE.java b/app/src/main/java/com/MAVLink/enums/MAV_VTOL_STATE.java index 40fd9fd..f2d28dc 100644 --- a/app/src/main/java/com/MAVLink/enums/MAV_VTOL_STATE.java +++ b/app/src/main/java/com/MAVLink/enums/MAV_VTOL_STATE.java @@ -6,15 +6,15 @@ package com.MAVLink.enums; -/** -* Enumeration of VTOL states -*/ +/** + * Enumeration of VTOL states + */ public class MAV_VTOL_STATE { - public static final int MAV_VTOL_STATE_UNDEFINED = 0; /* MAV is not configured as VTOL | */ - public static final int MAV_VTOL_STATE_TRANSITION_TO_FW = 1; /* VTOL is in transition from multicopter to fixed-wing | */ - public static final int MAV_VTOL_STATE_TRANSITION_TO_MC = 2; /* VTOL is in transition from fixed-wing to multicopter | */ - public static final int MAV_VTOL_STATE_MC = 3; /* VTOL is in multicopter state | */ - public static final int MAV_VTOL_STATE_FW = 4; /* VTOL is in fixed-wing state | */ - public static final int MAV_VTOL_STATE_ENUM_END = 5; /* | */ + public static final int MAV_VTOL_STATE_UNDEFINED = 0; /* MAV is not configured as VTOL | */ + public static final int MAV_VTOL_STATE_TRANSITION_TO_FW = 1; /* VTOL is in transition from multicopter to fixed-wing | */ + public static final int MAV_VTOL_STATE_TRANSITION_TO_MC = 2; /* VTOL is in transition from fixed-wing to multicopter | */ + public static final int MAV_VTOL_STATE_MC = 3; /* VTOL is in multicopter state | */ + public static final int MAV_VTOL_STATE_FW = 4; /* VTOL is in fixed-wing state | */ + public static final int MAV_VTOL_STATE_ENUM_END = 5; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MOTOR_TEST_ORDER.java b/app/src/main/java/com/MAVLink/enums/MOTOR_TEST_ORDER.java index 759c262..6b0a2eb 100644 --- a/app/src/main/java/com/MAVLink/enums/MOTOR_TEST_ORDER.java +++ b/app/src/main/java/com/MAVLink/enums/MOTOR_TEST_ORDER.java @@ -6,13 +6,13 @@ package com.MAVLink.enums; -/** -* -*/ +/** + * + */ public class MOTOR_TEST_ORDER { - public static final int MOTOR_TEST_ORDER_DEFAULT = 0; /* default autopilot motor test method | */ - public static final int MOTOR_TEST_ORDER_SEQUENCE = 1; /* motor numbers are specified as their index in a predefined vehicle-specific sequence | */ - public static final int MOTOR_TEST_ORDER_BOARD = 2; /* motor numbers are specified as the output as labeled on the board | */ - public static final int MOTOR_TEST_ORDER_ENUM_END = 3; /* | */ + public static final int MOTOR_TEST_ORDER_DEFAULT = 0; /* default autopilot motor test method | */ + public static final int MOTOR_TEST_ORDER_SEQUENCE = 1; /* motor numbers are specified as their index in a predefined vehicle-specific sequence | */ + public static final int MOTOR_TEST_ORDER_BOARD = 2; /* motor numbers are specified as the output as labeled on the board | */ + public static final int MOTOR_TEST_ORDER_ENUM_END = 3; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/MOTOR_TEST_THROTTLE_TYPE.java b/app/src/main/java/com/MAVLink/enums/MOTOR_TEST_THROTTLE_TYPE.java index 7b36ed4..b7a4dee 100644 --- a/app/src/main/java/com/MAVLink/enums/MOTOR_TEST_THROTTLE_TYPE.java +++ b/app/src/main/java/com/MAVLink/enums/MOTOR_TEST_THROTTLE_TYPE.java @@ -6,14 +6,14 @@ package com.MAVLink.enums; -/** -* -*/ +/** + * + */ public class MOTOR_TEST_THROTTLE_TYPE { - public static final int MOTOR_TEST_THROTTLE_PERCENT = 0; /* throttle as a percentage from 0 ~ 100 | */ - public static final int MOTOR_TEST_THROTTLE_PWM = 1; /* throttle as an absolute PWM value (normally in range of 1000~2000) | */ - public static final int MOTOR_TEST_THROTTLE_PILOT = 2; /* throttle pass-through from pilot's transmitter | */ - public static final int MOTOR_TEST_COMPASS_CAL = 3; /* per-motor compass calibration test | */ - public static final int MOTOR_TEST_THROTTLE_TYPE_ENUM_END = 4; /* | */ + public static final int MOTOR_TEST_THROTTLE_PERCENT = 0; /* throttle as a percentage from 0 ~ 100 | */ + public static final int MOTOR_TEST_THROTTLE_PWM = 1; /* throttle as an absolute PWM value (normally in range of 1000~2000) | */ + public static final int MOTOR_TEST_THROTTLE_PILOT = 2; /* throttle pass-through from pilot's transmitter | */ + public static final int MOTOR_TEST_COMPASS_CAL = 3; /* per-motor compass calibration test | */ + public static final int MOTOR_TEST_THROTTLE_TYPE_ENUM_END = 4; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/ORBIT_YAW_BEHAVIOUR.java b/app/src/main/java/com/MAVLink/enums/ORBIT_YAW_BEHAVIOUR.java index feaed4d..8b4ba1c 100644 --- a/app/src/main/java/com/MAVLink/enums/ORBIT_YAW_BEHAVIOUR.java +++ b/app/src/main/java/com/MAVLink/enums/ORBIT_YAW_BEHAVIOUR.java @@ -6,15 +6,15 @@ package com.MAVLink.enums; -/** -* Yaw behaviour during orbit flight. -*/ +/** + * Yaw behaviour during orbit flight. + */ public class ORBIT_YAW_BEHAVIOUR { - public static final int ORBIT_YAW_BEHAVIOUR_HOLD_FRONT_TO_CIRCLE_CENTER = 0; /* Vehicle front points to the center (default). | */ - public static final int ORBIT_YAW_BEHAVIOUR_HOLD_INITIAL_HEADING = 1; /* Vehicle front holds heading when message received. | */ - public static final int ORBIT_YAW_BEHAVIOUR_UNCONTROLLED = 2; /* Yaw uncontrolled. | */ - public static final int ORBIT_YAW_BEHAVIOUR_HOLD_FRONT_TANGENT_TO_CIRCLE = 3; /* Vehicle front follows flight path (tangential to circle). | */ - public static final int ORBIT_YAW_BEHAVIOUR_RC_CONTROLLED = 4; /* Yaw controlled by RC input. | */ - public static final int ORBIT_YAW_BEHAVIOUR_ENUM_END = 5; /* | */ + public static final int ORBIT_YAW_BEHAVIOUR_HOLD_FRONT_TO_CIRCLE_CENTER = 0; /* Vehicle front points to the center (default). | */ + public static final int ORBIT_YAW_BEHAVIOUR_HOLD_INITIAL_HEADING = 1; /* Vehicle front holds heading when message received. | */ + public static final int ORBIT_YAW_BEHAVIOUR_UNCONTROLLED = 2; /* Yaw uncontrolled. | */ + public static final int ORBIT_YAW_BEHAVIOUR_HOLD_FRONT_TANGENT_TO_CIRCLE = 3; /* Vehicle front follows flight path (tangential to circle). | */ + public static final int ORBIT_YAW_BEHAVIOUR_RC_CONTROLLED = 4; /* Yaw controlled by RC input. | */ + public static final int ORBIT_YAW_BEHAVIOUR_ENUM_END = 5; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/PARACHUTE_ACTION.java b/app/src/main/java/com/MAVLink/enums/PARACHUTE_ACTION.java index 1cf935d..b4e3278 100644 --- a/app/src/main/java/com/MAVLink/enums/PARACHUTE_ACTION.java +++ b/app/src/main/java/com/MAVLink/enums/PARACHUTE_ACTION.java @@ -6,13 +6,13 @@ package com.MAVLink.enums; -/** -* -*/ +/** + * + */ public class PARACHUTE_ACTION { - public static final int PARACHUTE_DISABLE = 0; /* Disable parachute release. | */ - public static final int PARACHUTE_ENABLE = 1; /* Enable parachute release. | */ - public static final int PARACHUTE_RELEASE = 2; /* Release parachute. | */ - public static final int PARACHUTE_ACTION_ENUM_END = 3; /* | */ + public static final int PARACHUTE_DISABLE = 0; /* Disable parachute release. | */ + public static final int PARACHUTE_ENABLE = 1; /* Enable parachute release. | */ + public static final int PARACHUTE_RELEASE = 2; /* Release parachute. | */ + public static final int PARACHUTE_ACTION_ENUM_END = 3; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/PARAM_ACK.java b/app/src/main/java/com/MAVLink/enums/PARAM_ACK.java index fc3eaeb..a53afc7 100644 --- a/app/src/main/java/com/MAVLink/enums/PARAM_ACK.java +++ b/app/src/main/java/com/MAVLink/enums/PARAM_ACK.java @@ -6,14 +6,14 @@ package com.MAVLink.enums; -/** -* Result from a PARAM_EXT_SET message. -*/ +/** + * Result from a PARAM_EXT_SET message. + */ public class PARAM_ACK { - public static final int PARAM_ACK_ACCEPTED = 0; /* Parameter value ACCEPTED and SET | */ - public static final int PARAM_ACK_VALUE_UNSUPPORTED = 1; /* Parameter value UNKNOWN/UNSUPPORTED | */ - public static final int PARAM_ACK_FAILED = 2; /* Parameter failed to set | */ - public static final int PARAM_ACK_IN_PROGRESS = 3; /* Parameter value received but not yet validated or set. A subsequent PARAM_EXT_ACK will follow once operation is completed with the actual result. These are for parameters that may take longer to set. Instead of waiting for an ACK and potentially timing out, you will immediately receive this response to let you know it was received. | */ - public static final int PARAM_ACK_ENUM_END = 4; /* | */ + public static final int PARAM_ACK_ACCEPTED = 0; /* Parameter value ACCEPTED and SET | */ + public static final int PARAM_ACK_VALUE_UNSUPPORTED = 1; /* Parameter value UNKNOWN/UNSUPPORTED | */ + public static final int PARAM_ACK_FAILED = 2; /* Parameter failed to set | */ + public static final int PARAM_ACK_IN_PROGRESS = 3; /* Parameter value received but not yet validated or set. A subsequent PARAM_EXT_ACK will follow once operation is completed with the actual result. These are for parameters that may take longer to set. Instead of waiting for an ACK and potentially timing out, you will immediately receive this response to let you know it was received. | */ + public static final int PARAM_ACK_ENUM_END = 4; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/PID_TUNING_AXIS.java b/app/src/main/java/com/MAVLink/enums/PID_TUNING_AXIS.java index adc8c1f..8e985ba 100644 --- a/app/src/main/java/com/MAVLink/enums/PID_TUNING_AXIS.java +++ b/app/src/main/java/com/MAVLink/enums/PID_TUNING_AXIS.java @@ -6,16 +6,16 @@ package com.MAVLink.enums; -/** -* -*/ +/** + * + */ public class PID_TUNING_AXIS { - public static final int PID_TUNING_ROLL = 1; /* | */ - public static final int PID_TUNING_PITCH = 2; /* | */ - public static final int PID_TUNING_YAW = 3; /* | */ - public static final int PID_TUNING_ACCZ = 4; /* | */ - public static final int PID_TUNING_STEER = 5; /* | */ - public static final int PID_TUNING_LANDING = 6; /* | */ - public static final int PID_TUNING_AXIS_ENUM_END = 7; /* | */ + public static final int PID_TUNING_ROLL = 1; /* | */ + public static final int PID_TUNING_PITCH = 2; /* | */ + public static final int PID_TUNING_YAW = 3; /* | */ + public static final int PID_TUNING_ACCZ = 4; /* | */ + public static final int PID_TUNING_STEER = 5; /* | */ + public static final int PID_TUNING_LANDING = 6; /* | */ + public static final int PID_TUNING_AXIS_ENUM_END = 7; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/PLANE_MODE.java b/app/src/main/java/com/MAVLink/enums/PLANE_MODE.java index d795abc..74a6402 100644 --- a/app/src/main/java/com/MAVLink/enums/PLANE_MODE.java +++ b/app/src/main/java/com/MAVLink/enums/PLANE_MODE.java @@ -6,32 +6,32 @@ package com.MAVLink.enums; -/** -* A mapping of plane flight modes for custom_mode field of heartbeat. -*/ +/** + * A mapping of plane flight modes for custom_mode field of heartbeat. + */ public class PLANE_MODE { - public static final int PLANE_MODE_MANUAL = 0; /* | */ - public static final int PLANE_MODE_CIRCLE = 1; /* | */ - public static final int PLANE_MODE_STABILIZE = 2; /* | */ - public static final int PLANE_MODE_TRAINING = 3; /* | */ - public static final int PLANE_MODE_ACRO = 4; /* | */ - public static final int PLANE_MODE_FLY_BY_WIRE_A = 5; /* | */ - public static final int PLANE_MODE_FLY_BY_WIRE_B = 6; /* | */ - public static final int PLANE_MODE_CRUISE = 7; /* | */ - public static final int PLANE_MODE_AUTOTUNE = 8; /* | */ - public static final int PLANE_MODE_AUTO = 10; /* | */ - public static final int PLANE_MODE_RTL = 11; /* | */ - public static final int PLANE_MODE_LOITER = 12; /* | */ - public static final int PLANE_MODE_TAKEOFF = 13; /* | */ - public static final int PLANE_MODE_AVOID_ADSB = 14; /* | */ - public static final int PLANE_MODE_GUIDED = 15; /* | */ - public static final int PLANE_MODE_INITIALIZING = 16; /* | */ - public static final int PLANE_MODE_QSTABILIZE = 17; /* | */ - public static final int PLANE_MODE_QHOVER = 18; /* | */ - public static final int PLANE_MODE_QLOITER = 19; /* | */ - public static final int PLANE_MODE_QLAND = 20; /* | */ - public static final int PLANE_MODE_QRTL = 21; /* | */ - public static final int PLANE_MODE_QAUTOTUNE = 22; /* | */ - public static final int PLANE_MODE_ENUM_END = 23; /* | */ + public static final int PLANE_MODE_MANUAL = 0; /* | */ + public static final int PLANE_MODE_CIRCLE = 1; /* | */ + public static final int PLANE_MODE_STABILIZE = 2; /* | */ + public static final int PLANE_MODE_TRAINING = 3; /* | */ + public static final int PLANE_MODE_ACRO = 4; /* | */ + public static final int PLANE_MODE_FLY_BY_WIRE_A = 5; /* | */ + public static final int PLANE_MODE_FLY_BY_WIRE_B = 6; /* | */ + public static final int PLANE_MODE_CRUISE = 7; /* | */ + public static final int PLANE_MODE_AUTOTUNE = 8; /* | */ + public static final int PLANE_MODE_AUTO = 10; /* | */ + public static final int PLANE_MODE_RTL = 11; /* | */ + public static final int PLANE_MODE_LOITER = 12; /* | */ + public static final int PLANE_MODE_TAKEOFF = 13; /* | */ + public static final int PLANE_MODE_AVOID_ADSB = 14; /* | */ + public static final int PLANE_MODE_GUIDED = 15; /* | */ + public static final int PLANE_MODE_INITIALIZING = 16; /* | */ + public static final int PLANE_MODE_QSTABILIZE = 17; /* | */ + public static final int PLANE_MODE_QHOVER = 18; /* | */ + public static final int PLANE_MODE_QLOITER = 19; /* | */ + public static final int PLANE_MODE_QLAND = 20; /* | */ + public static final int PLANE_MODE_QRTL = 21; /* | */ + public static final int PLANE_MODE_QAUTOTUNE = 22; /* | */ + public static final int PLANE_MODE_ENUM_END = 23; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/POSITION_TARGET_TYPEMASK.java b/app/src/main/java/com/MAVLink/enums/POSITION_TARGET_TYPEMASK.java index 7976f5a..ffbb5cf 100644 --- a/app/src/main/java/com/MAVLink/enums/POSITION_TARGET_TYPEMASK.java +++ b/app/src/main/java/com/MAVLink/enums/POSITION_TARGET_TYPEMASK.java @@ -6,22 +6,22 @@ package com.MAVLink.enums; -/** -* Bitmap to indicate which dimensions should be ignored by the vehicle: a value of 0b0000000000000000 or 0b0000001000000000 indicates that none of the setpoint dimensions should be ignored. If bit 9 is set the floats afx afy afz should be interpreted as force instead of acceleration. -*/ +/** + * Bitmap to indicate which dimensions should be ignored by the vehicle: a value of 0b0000000000000000 or 0b0000001000000000 indicates that none of the setpoint dimensions should be ignored. If bit 9 is set the floats afx afy afz should be interpreted as force instead of acceleration. + */ public class POSITION_TARGET_TYPEMASK { - public static final int POSITION_TARGET_TYPEMASK_X_IGNORE = 1; /* Ignore position x | */ - public static final int POSITION_TARGET_TYPEMASK_Y_IGNORE = 2; /* Ignore position y | */ - public static final int POSITION_TARGET_TYPEMASK_Z_IGNORE = 4; /* Ignore position z | */ - public static final int POSITION_TARGET_TYPEMASK_VX_IGNORE = 8; /* Ignore velocity x | */ - public static final int POSITION_TARGET_TYPEMASK_VY_IGNORE = 16; /* Ignore velocity y | */ - public static final int POSITION_TARGET_TYPEMASK_VZ_IGNORE = 32; /* Ignore velocity z | */ - public static final int POSITION_TARGET_TYPEMASK_AX_IGNORE = 64; /* Ignore acceleration x | */ - public static final int POSITION_TARGET_TYPEMASK_AY_IGNORE = 128; /* Ignore acceleration y | */ - public static final int POSITION_TARGET_TYPEMASK_AZ_IGNORE = 256; /* Ignore acceleration z | */ - public static final int POSITION_TARGET_TYPEMASK_FORCE_SET = 512; /* Use force instead of acceleration | */ - public static final int POSITION_TARGET_TYPEMASK_YAW_IGNORE = 1024; /* Ignore yaw | */ - public static final int POSITION_TARGET_TYPEMASK_YAW_RATE_IGNORE = 2048; /* Ignore yaw rate | */ - public static final int POSITION_TARGET_TYPEMASK_ENUM_END = 2049; /* | */ + public static final int POSITION_TARGET_TYPEMASK_X_IGNORE = 1; /* Ignore position x | */ + public static final int POSITION_TARGET_TYPEMASK_Y_IGNORE = 2; /* Ignore position y | */ + public static final int POSITION_TARGET_TYPEMASK_Z_IGNORE = 4; /* Ignore position z | */ + public static final int POSITION_TARGET_TYPEMASK_VX_IGNORE = 8; /* Ignore velocity x | */ + public static final int POSITION_TARGET_TYPEMASK_VY_IGNORE = 16; /* Ignore velocity y | */ + public static final int POSITION_TARGET_TYPEMASK_VZ_IGNORE = 32; /* Ignore velocity z | */ + public static final int POSITION_TARGET_TYPEMASK_AX_IGNORE = 64; /* Ignore acceleration x | */ + public static final int POSITION_TARGET_TYPEMASK_AY_IGNORE = 128; /* Ignore acceleration y | */ + public static final int POSITION_TARGET_TYPEMASK_AZ_IGNORE = 256; /* Ignore acceleration z | */ + public static final int POSITION_TARGET_TYPEMASK_FORCE_SET = 512; /* Use force instead of acceleration | */ + public static final int POSITION_TARGET_TYPEMASK_YAW_IGNORE = 1024; /* Ignore yaw | */ + public static final int POSITION_TARGET_TYPEMASK_YAW_RATE_IGNORE = 2048; /* Ignore yaw rate | */ + public static final int POSITION_TARGET_TYPEMASK_ENUM_END = 2049; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/PRECISION_LAND_MODE.java b/app/src/main/java/com/MAVLink/enums/PRECISION_LAND_MODE.java index 7036e25..cdb20f6 100644 --- a/app/src/main/java/com/MAVLink/enums/PRECISION_LAND_MODE.java +++ b/app/src/main/java/com/MAVLink/enums/PRECISION_LAND_MODE.java @@ -6,13 +6,13 @@ package com.MAVLink.enums; -/** -* Precision land modes (used in MAV_CMD_NAV_LAND). -*/ +/** + * Precision land modes (used in MAV_CMD_NAV_LAND). + */ public class PRECISION_LAND_MODE { - public static final int PRECISION_LAND_MODE_DISABLED = 0; /* Normal (non-precision) landing. | */ - public static final int PRECISION_LAND_MODE_OPPORTUNISTIC = 1; /* Use precision landing if beacon detected when land command accepted, otherwise land normally. | */ - public static final int PRECISION_LAND_MODE_REQUIRED = 2; /* Use precision landing, searching for beacon if not found when land command accepted (land normally if beacon cannot be found). | */ - public static final int PRECISION_LAND_MODE_ENUM_END = 3; /* | */ + public static final int PRECISION_LAND_MODE_DISABLED = 0; /* Normal (non-precision) landing. | */ + public static final int PRECISION_LAND_MODE_OPPORTUNISTIC = 1; /* Use precision landing if beacon detected when land command accepted, otherwise land normally. | */ + public static final int PRECISION_LAND_MODE_REQUIRED = 2; /* Use precision landing, searching for beacon if not found when land command accepted (land normally if beacon cannot be found). | */ + public static final int PRECISION_LAND_MODE_ENUM_END = 3; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/RALLY_FLAGS.java b/app/src/main/java/com/MAVLink/enums/RALLY_FLAGS.java index 22c303f..0592079 100644 --- a/app/src/main/java/com/MAVLink/enums/RALLY_FLAGS.java +++ b/app/src/main/java/com/MAVLink/enums/RALLY_FLAGS.java @@ -6,12 +6,12 @@ package com.MAVLink.enums; -/** -* Flags in RALLY_POINT message. -*/ +/** + * Flags in RALLY_POINT message. + */ public class RALLY_FLAGS { - public static final int FAVORABLE_WIND = 1; /* Flag set when requiring favorable winds for landing. | */ - public static final int LAND_IMMEDIATELY = 2; /* Flag set when plane is to immediately descend to break altitude and land without GCS intervention. Flag not set when plane is to loiter at Rally point until commanded to land. | */ - public static final int RALLY_FLAGS_ENUM_END = 3; /* | */ + public static final int FAVORABLE_WIND = 1; /* Flag set when requiring favorable winds for landing. | */ + public static final int LAND_IMMEDIATELY = 2; /* Flag set when plane is to immediately descend to break altitude and land without GCS intervention. Flag not set when plane is to loiter at Rally point until commanded to land. | */ + public static final int RALLY_FLAGS_ENUM_END = 3; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/RC_TYPE.java b/app/src/main/java/com/MAVLink/enums/RC_TYPE.java index 5e5c14e..0ca65a1 100644 --- a/app/src/main/java/com/MAVLink/enums/RC_TYPE.java +++ b/app/src/main/java/com/MAVLink/enums/RC_TYPE.java @@ -6,12 +6,12 @@ package com.MAVLink.enums; -/** -* RC type -*/ +/** + * RC type + */ public class RC_TYPE { - public static final int RC_TYPE_SPEKTRUM_DSM2 = 0; /* Spektrum DSM2 | */ - public static final int RC_TYPE_SPEKTRUM_DSMX = 1; /* Spektrum DSMX | */ - public static final int RC_TYPE_ENUM_END = 2; /* | */ + public static final int RC_TYPE_SPEKTRUM_DSM2 = 0; /* Spektrum DSM2 | */ + public static final int RC_TYPE_SPEKTRUM_DSMX = 1; /* Spektrum DSMX | */ + public static final int RC_TYPE_ENUM_END = 2; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/ROVER_MODE.java b/app/src/main/java/com/MAVLink/enums/ROVER_MODE.java index 1d4c8d3..6154f38 100644 --- a/app/src/main/java/com/MAVLink/enums/ROVER_MODE.java +++ b/app/src/main/java/com/MAVLink/enums/ROVER_MODE.java @@ -6,20 +6,20 @@ package com.MAVLink.enums; -/** -* A mapping of rover flight modes for custom_mode field of heartbeat. -*/ +/** + * A mapping of rover flight modes for custom_mode field of heartbeat. + */ public class ROVER_MODE { - public static final int ROVER_MODE_MANUAL = 0; /* | */ - public static final int ROVER_MODE_ACRO = 1; /* | */ - public static final int ROVER_MODE_STEERING = 3; /* | */ - public static final int ROVER_MODE_HOLD = 4; /* | */ - public static final int ROVER_MODE_LOITER = 5; /* | */ - public static final int ROVER_MODE_AUTO = 10; /* | */ - public static final int ROVER_MODE_RTL = 11; /* | */ - public static final int ROVER_MODE_SMART_RTL = 12; /* | */ - public static final int ROVER_MODE_GUIDED = 15; /* | */ - public static final int ROVER_MODE_INITIALIZING = 16; /* | */ - public static final int ROVER_MODE_ENUM_END = 17; /* | */ + public static final int ROVER_MODE_MANUAL = 0; /* | */ + public static final int ROVER_MODE_ACRO = 1; /* | */ + public static final int ROVER_MODE_STEERING = 3; /* | */ + public static final int ROVER_MODE_HOLD = 4; /* | */ + public static final int ROVER_MODE_LOITER = 5; /* | */ + public static final int ROVER_MODE_AUTO = 10; /* | */ + public static final int ROVER_MODE_RTL = 11; /* | */ + public static final int ROVER_MODE_SMART_RTL = 12; /* | */ + public static final int ROVER_MODE_GUIDED = 15; /* | */ + public static final int ROVER_MODE_INITIALIZING = 16; /* | */ + public static final int ROVER_MODE_ENUM_END = 17; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/RTK_BASELINE_COORDINATE_SYSTEM.java b/app/src/main/java/com/MAVLink/enums/RTK_BASELINE_COORDINATE_SYSTEM.java index 00d6bde..c65c956 100644 --- a/app/src/main/java/com/MAVLink/enums/RTK_BASELINE_COORDINATE_SYSTEM.java +++ b/app/src/main/java/com/MAVLink/enums/RTK_BASELINE_COORDINATE_SYSTEM.java @@ -6,12 +6,12 @@ package com.MAVLink.enums; -/** -* RTK GPS baseline coordinate system, used for RTK corrections -*/ +/** + * RTK GPS baseline coordinate system, used for RTK corrections + */ public class RTK_BASELINE_COORDINATE_SYSTEM { - public static final int RTK_BASELINE_COORDINATE_SYSTEM_ECEF = 0; /* Earth-centered, Earth-fixed | */ - public static final int RTK_BASELINE_COORDINATE_SYSTEM_NED = 1; /* RTK basestation centered, north, east, down | */ - public static final int RTK_BASELINE_COORDINATE_SYSTEM_ENUM_END = 2; /* | */ + public static final int RTK_BASELINE_COORDINATE_SYSTEM_ECEF = 0; /* Earth-centered, Earth-fixed | */ + public static final int RTK_BASELINE_COORDINATE_SYSTEM_NED = 1; /* RTK basestation centered, north, east, down | */ + public static final int RTK_BASELINE_COORDINATE_SYSTEM_ENUM_END = 2; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/SERIAL_CONTROL_DEV.java b/app/src/main/java/com/MAVLink/enums/SERIAL_CONTROL_DEV.java index a1bb451..86261ba 100644 --- a/app/src/main/java/com/MAVLink/enums/SERIAL_CONTROL_DEV.java +++ b/app/src/main/java/com/MAVLink/enums/SERIAL_CONTROL_DEV.java @@ -6,25 +6,25 @@ package com.MAVLink.enums; -/** -* SERIAL_CONTROL device types -*/ +/** + * SERIAL_CONTROL device types + */ public class SERIAL_CONTROL_DEV { - public static final int SERIAL_CONTROL_DEV_TELEM1 = 0; /* First telemetry port | */ - public static final int SERIAL_CONTROL_DEV_TELEM2 = 1; /* Second telemetry port | */ - public static final int SERIAL_CONTROL_DEV_GPS1 = 2; /* First GPS port | */ - public static final int SERIAL_CONTROL_DEV_GPS2 = 3; /* Second GPS port | */ - public static final int SERIAL_CONTROL_DEV_SHELL = 10; /* system shell | */ - public static final int SERIAL_CONTROL_SERIAL0 = 100; /* SERIAL0 | */ - public static final int SERIAL_CONTROL_SERIAL1 = 101; /* SERIAL1 | */ - public static final int SERIAL_CONTROL_SERIAL2 = 102; /* SERIAL2 | */ - public static final int SERIAL_CONTROL_SERIAL3 = 103; /* SERIAL3 | */ - public static final int SERIAL_CONTROL_SERIAL4 = 104; /* SERIAL4 | */ - public static final int SERIAL_CONTROL_SERIAL5 = 105; /* SERIAL5 | */ - public static final int SERIAL_CONTROL_SERIAL6 = 106; /* SERIAL6 | */ - public static final int SERIAL_CONTROL_SERIAL7 = 107; /* SERIAL7 | */ - public static final int SERIAL_CONTROL_SERIAL8 = 108; /* SERIAL8 | */ - public static final int SERIAL_CONTROL_SERIAL9 = 109; /* SERIAL9 | */ - public static final int SERIAL_CONTROL_DEV_ENUM_END = 110; /* | */ + public static final int SERIAL_CONTROL_DEV_TELEM1 = 0; /* First telemetry port | */ + public static final int SERIAL_CONTROL_DEV_TELEM2 = 1; /* Second telemetry port | */ + public static final int SERIAL_CONTROL_DEV_GPS1 = 2; /* First GPS port | */ + public static final int SERIAL_CONTROL_DEV_GPS2 = 3; /* Second GPS port | */ + public static final int SERIAL_CONTROL_DEV_SHELL = 10; /* system shell | */ + public static final int SERIAL_CONTROL_SERIAL0 = 100; /* SERIAL0 | */ + public static final int SERIAL_CONTROL_SERIAL1 = 101; /* SERIAL1 | */ + public static final int SERIAL_CONTROL_SERIAL2 = 102; /* SERIAL2 | */ + public static final int SERIAL_CONTROL_SERIAL3 = 103; /* SERIAL3 | */ + public static final int SERIAL_CONTROL_SERIAL4 = 104; /* SERIAL4 | */ + public static final int SERIAL_CONTROL_SERIAL5 = 105; /* SERIAL5 | */ + public static final int SERIAL_CONTROL_SERIAL6 = 106; /* SERIAL6 | */ + public static final int SERIAL_CONTROL_SERIAL7 = 107; /* SERIAL7 | */ + public static final int SERIAL_CONTROL_SERIAL8 = 108; /* SERIAL8 | */ + public static final int SERIAL_CONTROL_SERIAL9 = 109; /* SERIAL9 | */ + public static final int SERIAL_CONTROL_DEV_ENUM_END = 110; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/SERIAL_CONTROL_FLAG.java b/app/src/main/java/com/MAVLink/enums/SERIAL_CONTROL_FLAG.java index 9918da6..92e3933 100644 --- a/app/src/main/java/com/MAVLink/enums/SERIAL_CONTROL_FLAG.java +++ b/app/src/main/java/com/MAVLink/enums/SERIAL_CONTROL_FLAG.java @@ -6,15 +6,15 @@ package com.MAVLink.enums; -/** -* SERIAL_CONTROL flags (bitmask) -*/ +/** + * SERIAL_CONTROL flags (bitmask) + */ public class SERIAL_CONTROL_FLAG { - public static final int SERIAL_CONTROL_FLAG_REPLY = 1; /* Set if this is a reply | */ - public static final int SERIAL_CONTROL_FLAG_RESPOND = 2; /* Set if the sender wants the receiver to send a response as another SERIAL_CONTROL message | */ - public static final int SERIAL_CONTROL_FLAG_EXCLUSIVE = 4; /* Set if access to the serial port should be removed from whatever driver is currently using it, giving exclusive access to the SERIAL_CONTROL protocol. The port can be handed back by sending a request without this flag set | */ - public static final int SERIAL_CONTROL_FLAG_BLOCKING = 8; /* Block on writes to the serial port | */ - public static final int SERIAL_CONTROL_FLAG_MULTI = 16; /* Send multiple replies until port is drained | */ - public static final int SERIAL_CONTROL_FLAG_ENUM_END = 17; /* | */ + public static final int SERIAL_CONTROL_FLAG_REPLY = 1; /* Set if this is a reply | */ + public static final int SERIAL_CONTROL_FLAG_RESPOND = 2; /* Set if the sender wants the receiver to send a response as another SERIAL_CONTROL message | */ + public static final int SERIAL_CONTROL_FLAG_EXCLUSIVE = 4; /* Set if access to the serial port should be removed from whatever driver is currently using it, giving exclusive access to the SERIAL_CONTROL protocol. The port can be handed back by sending a request without this flag set | */ + public static final int SERIAL_CONTROL_FLAG_BLOCKING = 8; /* Block on writes to the serial port | */ + public static final int SERIAL_CONTROL_FLAG_MULTI = 16; /* Send multiple replies until port is drained | */ + public static final int SERIAL_CONTROL_FLAG_ENUM_END = 17; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/SET_FOCUS_TYPE.java b/app/src/main/java/com/MAVLink/enums/SET_FOCUS_TYPE.java index 8d266a6..7dad656 100644 --- a/app/src/main/java/com/MAVLink/enums/SET_FOCUS_TYPE.java +++ b/app/src/main/java/com/MAVLink/enums/SET_FOCUS_TYPE.java @@ -6,14 +6,14 @@ package com.MAVLink.enums; -/** -* Focus types for MAV_CMD_SET_CAMERA_FOCUS -*/ +/** + * Focus types for MAV_CMD_SET_CAMERA_FOCUS + */ public class SET_FOCUS_TYPE { - public static final int FOCUS_TYPE_STEP = 0; /* Focus one step increment (-1 for focusing in, 1 for focusing out towards infinity). | */ - public static final int FOCUS_TYPE_CONTINUOUS = 1; /* Continuous focus up/down until stopped (-1 for focusing in, 1 for focusing out towards infinity, 0 to stop focusing) | */ - public static final int FOCUS_TYPE_RANGE = 2; /* Focus value as proportion of full camera focus range (a value between 0.0 and 100.0) | */ - public static final int FOCUS_TYPE_METERS = 3; /* Focus value in metres. Note that there is no message to get the valid focus range of the camera, so this can type can only be used for cameras where the range is known (implying that this cannot reliably be used in a GCS for an arbitrary camera). | */ - public static final int SET_FOCUS_TYPE_ENUM_END = 4; /* | */ + public static final int FOCUS_TYPE_STEP = 0; /* Focus one step increment (-1 for focusing in, 1 for focusing out towards infinity). | */ + public static final int FOCUS_TYPE_CONTINUOUS = 1; /* Continuous focus up/down until stopped (-1 for focusing in, 1 for focusing out towards infinity, 0 to stop focusing) | */ + public static final int FOCUS_TYPE_RANGE = 2; /* Focus value as proportion of full camera focus range (a value between 0.0 and 100.0) | */ + public static final int FOCUS_TYPE_METERS = 3; /* Focus value in metres. Note that there is no message to get the valid focus range of the camera, so this can type can only be used for cameras where the range is known (implying that this cannot reliably be used in a GCS for an arbitrary camera). | */ + public static final int SET_FOCUS_TYPE_ENUM_END = 4; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/STORAGE_STATUS.java b/app/src/main/java/com/MAVLink/enums/STORAGE_STATUS.java index ce3ce4b..bdb2632 100644 --- a/app/src/main/java/com/MAVLink/enums/STORAGE_STATUS.java +++ b/app/src/main/java/com/MAVLink/enums/STORAGE_STATUS.java @@ -6,14 +6,14 @@ package com.MAVLink.enums; -/** -* Flags to indicate the status of camera storage. -*/ +/** + * Flags to indicate the status of camera storage. + */ public class STORAGE_STATUS { - public static final int STORAGE_STATUS_EMPTY = 0; /* Storage is missing (no microSD card loaded for example.) | */ - public static final int STORAGE_STATUS_UNFORMATTED = 1; /* Storage present but unformatted. | */ - public static final int STORAGE_STATUS_READY = 2; /* Storage present and ready. | */ - public static final int STORAGE_STATUS_NOT_SUPPORTED = 3; /* Camera does not supply storage status information. Capacity information in STORAGE_INFORMATION fields will be ignored. | */ - public static final int STORAGE_STATUS_ENUM_END = 4; /* | */ + public static final int STORAGE_STATUS_EMPTY = 0; /* Storage is missing (no microSD card loaded for example.) | */ + public static final int STORAGE_STATUS_UNFORMATTED = 1; /* Storage present but unformatted. | */ + public static final int STORAGE_STATUS_READY = 2; /* Storage present and ready. | */ + public static final int STORAGE_STATUS_NOT_SUPPORTED = 3; /* Camera does not supply storage status information. Capacity information in STORAGE_INFORMATION fields will be ignored. | */ + public static final int STORAGE_STATUS_ENUM_END = 4; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/SUB_MODE.java b/app/src/main/java/com/MAVLink/enums/SUB_MODE.java index 754140d..7257894 100644 --- a/app/src/main/java/com/MAVLink/enums/SUB_MODE.java +++ b/app/src/main/java/com/MAVLink/enums/SUB_MODE.java @@ -6,19 +6,19 @@ package com.MAVLink.enums; -/** -* A mapping of sub flight modes for custom_mode field of heartbeat. -*/ +/** + * A mapping of sub flight modes for custom_mode field of heartbeat. + */ public class SUB_MODE { - public static final int SUB_MODE_STABILIZE = 0; /* | */ - public static final int SUB_MODE_ACRO = 1; /* | */ - public static final int SUB_MODE_ALT_HOLD = 2; /* | */ - public static final int SUB_MODE_AUTO = 3; /* | */ - public static final int SUB_MODE_GUIDED = 4; /* | */ - public static final int SUB_MODE_CIRCLE = 7; /* | */ - public static final int SUB_MODE_SURFACE = 9; /* | */ - public static final int SUB_MODE_POSHOLD = 16; /* | */ - public static final int SUB_MODE_MANUAL = 19; /* | */ - public static final int SUB_MODE_ENUM_END = 20; /* | */ + public static final int SUB_MODE_STABILIZE = 0; /* | */ + public static final int SUB_MODE_ACRO = 1; /* | */ + public static final int SUB_MODE_ALT_HOLD = 2; /* | */ + public static final int SUB_MODE_AUTO = 3; /* | */ + public static final int SUB_MODE_GUIDED = 4; /* | */ + public static final int SUB_MODE_CIRCLE = 7; /* | */ + public static final int SUB_MODE_SURFACE = 9; /* | */ + public static final int SUB_MODE_POSHOLD = 16; /* | */ + public static final int SUB_MODE_MANUAL = 19; /* | */ + public static final int SUB_MODE_ENUM_END = 20; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/TRACKER_MODE.java b/app/src/main/java/com/MAVLink/enums/TRACKER_MODE.java index d17f506..bf4ed7a 100644 --- a/app/src/main/java/com/MAVLink/enums/TRACKER_MODE.java +++ b/app/src/main/java/com/MAVLink/enums/TRACKER_MODE.java @@ -6,16 +6,16 @@ package com.MAVLink.enums; -/** -* A mapping of antenna tracker flight modes for custom_mode field of heartbeat. -*/ +/** + * A mapping of antenna tracker flight modes for custom_mode field of heartbeat. + */ public class TRACKER_MODE { - public static final int TRACKER_MODE_MANUAL = 0; /* | */ - public static final int TRACKER_MODE_STOP = 1; /* | */ - public static final int TRACKER_MODE_SCAN = 2; /* | */ - public static final int TRACKER_MODE_SERVO_TEST = 3; /* | */ - public static final int TRACKER_MODE_AUTO = 10; /* | */ - public static final int TRACKER_MODE_INITIALIZING = 16; /* | */ - public static final int TRACKER_MODE_ENUM_END = 17; /* | */ + public static final int TRACKER_MODE_MANUAL = 0; /* | */ + public static final int TRACKER_MODE_STOP = 1; /* | */ + public static final int TRACKER_MODE_SCAN = 2; /* | */ + public static final int TRACKER_MODE_SERVO_TEST = 3; /* | */ + public static final int TRACKER_MODE_AUTO = 10; /* | */ + public static final int TRACKER_MODE_INITIALIZING = 16; /* | */ + public static final int TRACKER_MODE_ENUM_END = 17; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/TUNE_FORMAT.java b/app/src/main/java/com/MAVLink/enums/TUNE_FORMAT.java index 0e6e644..df01032 100644 --- a/app/src/main/java/com/MAVLink/enums/TUNE_FORMAT.java +++ b/app/src/main/java/com/MAVLink/enums/TUNE_FORMAT.java @@ -6,12 +6,12 @@ package com.MAVLink.enums; -/** -* Tune formats (used for vehicle buzzer/tone generation). -*/ +/** + * Tune formats (used for vehicle buzzer/tone generation). + */ public class TUNE_FORMAT { - public static final int TUNE_FORMAT_QBASIC1_1 = 1; /* Format is QBasic 1.1 Play: https://www.qbasic.net/en/reference/qb11/Statement/PLAY-006.htm. | */ - public static final int TUNE_FORMAT_MML_MODERN = 2; /* Format is Modern Music Markup Language (MML): https://en.wikipedia.org/wiki/Music_Macro_Language#Modern_MML. | */ - public static final int TUNE_FORMAT_ENUM_END = 3; /* | */ + public static final int TUNE_FORMAT_QBASIC1_1 = 1; /* Format is QBasic 1.1 Play: https://www.qbasic.net/en/reference/qb11/Statement/PLAY-006.htm. | */ + public static final int TUNE_FORMAT_MML_MODERN = 2; /* Format is Modern Music Markup Language (MML): https://en.wikipedia.org/wiki/Music_Macro_Language#Modern_MML. | */ + public static final int TUNE_FORMAT_ENUM_END = 3; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/UAVCAN_NODE_HEALTH.java b/app/src/main/java/com/MAVLink/enums/UAVCAN_NODE_HEALTH.java index d779f6d..eaa3d9d 100644 --- a/app/src/main/java/com/MAVLink/enums/UAVCAN_NODE_HEALTH.java +++ b/app/src/main/java/com/MAVLink/enums/UAVCAN_NODE_HEALTH.java @@ -6,14 +6,14 @@ package com.MAVLink.enums; -/** -* Generalized UAVCAN node health -*/ +/** + * Generalized UAVCAN node health + */ public class UAVCAN_NODE_HEALTH { - public static final int UAVCAN_NODE_HEALTH_OK = 0; /* The node is functioning properly. | */ - public static final int UAVCAN_NODE_HEALTH_WARNING = 1; /* A critical parameter went out of range or the node has encountered a minor failure. | */ - public static final int UAVCAN_NODE_HEALTH_ERROR = 2; /* The node has encountered a major failure. | */ - public static final int UAVCAN_NODE_HEALTH_CRITICAL = 3; /* The node has suffered a fatal malfunction. | */ - public static final int UAVCAN_NODE_HEALTH_ENUM_END = 4; /* | */ + public static final int UAVCAN_NODE_HEALTH_OK = 0; /* The node is functioning properly. | */ + public static final int UAVCAN_NODE_HEALTH_WARNING = 1; /* A critical parameter went out of range or the node has encountered a minor failure. | */ + public static final int UAVCAN_NODE_HEALTH_ERROR = 2; /* The node has encountered a major failure. | */ + public static final int UAVCAN_NODE_HEALTH_CRITICAL = 3; /* The node has suffered a fatal malfunction. | */ + public static final int UAVCAN_NODE_HEALTH_ENUM_END = 4; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/UAVCAN_NODE_MODE.java b/app/src/main/java/com/MAVLink/enums/UAVCAN_NODE_MODE.java index 0429f37..8a15689 100644 --- a/app/src/main/java/com/MAVLink/enums/UAVCAN_NODE_MODE.java +++ b/app/src/main/java/com/MAVLink/enums/UAVCAN_NODE_MODE.java @@ -6,15 +6,15 @@ package com.MAVLink.enums; -/** -* Generalized UAVCAN node mode -*/ +/** + * Generalized UAVCAN node mode + */ public class UAVCAN_NODE_MODE { - public static final int UAVCAN_NODE_MODE_OPERATIONAL = 0; /* The node is performing its primary functions. | */ - public static final int UAVCAN_NODE_MODE_INITIALIZATION = 1; /* The node is initializing; this mode is entered immediately after startup. | */ - public static final int UAVCAN_NODE_MODE_MAINTENANCE = 2; /* The node is under maintenance. | */ - public static final int UAVCAN_NODE_MODE_SOFTWARE_UPDATE = 3; /* The node is in the process of updating its software. | */ - public static final int UAVCAN_NODE_MODE_OFFLINE = 7; /* The node is no longer available online. | */ - public static final int UAVCAN_NODE_MODE_ENUM_END = 8; /* | */ + public static final int UAVCAN_NODE_MODE_OPERATIONAL = 0; /* The node is performing its primary functions. | */ + public static final int UAVCAN_NODE_MODE_INITIALIZATION = 1; /* The node is initializing; this mode is entered immediately after startup. | */ + public static final int UAVCAN_NODE_MODE_MAINTENANCE = 2; /* The node is under maintenance. | */ + public static final int UAVCAN_NODE_MODE_SOFTWARE_UPDATE = 3; /* The node is in the process of updating its software. | */ + public static final int UAVCAN_NODE_MODE_OFFLINE = 7; /* The node is no longer available online. | */ + public static final int UAVCAN_NODE_MODE_ENUM_END = 8; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_EMERGENCY_STATUS.java b/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_EMERGENCY_STATUS.java index a94bb7a..61c4ab6 100644 --- a/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_EMERGENCY_STATUS.java +++ b/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_EMERGENCY_STATUS.java @@ -6,18 +6,18 @@ package com.MAVLink.enums; -/** -* Emergency status encoding -*/ +/** + * Emergency status encoding + */ public class UAVIONIX_ADSB_EMERGENCY_STATUS { - public static final int UAVIONIX_ADSB_OUT_NO_EMERGENCY = 0; /* | */ - public static final int UAVIONIX_ADSB_OUT_GENERAL_EMERGENCY = 1; /* | */ - public static final int UAVIONIX_ADSB_OUT_LIFEGUARD_EMERGENCY = 2; /* | */ - public static final int UAVIONIX_ADSB_OUT_MINIMUM_FUEL_EMERGENCY = 3; /* | */ - public static final int UAVIONIX_ADSB_OUT_NO_COMM_EMERGENCY = 4; /* | */ - public static final int UAVIONIX_ADSB_OUT_UNLAWFUL_INTERFERANCE_EMERGENCY = 5; /* | */ - public static final int UAVIONIX_ADSB_OUT_DOWNED_AIRCRAFT_EMERGENCY = 6; /* | */ - public static final int UAVIONIX_ADSB_OUT_RESERVED = 7; /* | */ - public static final int UAVIONIX_ADSB_EMERGENCY_STATUS_ENUM_END = 8; /* | */ + public static final int UAVIONIX_ADSB_OUT_NO_EMERGENCY = 0; /* | */ + public static final int UAVIONIX_ADSB_OUT_GENERAL_EMERGENCY = 1; /* | */ + public static final int UAVIONIX_ADSB_OUT_LIFEGUARD_EMERGENCY = 2; /* | */ + public static final int UAVIONIX_ADSB_OUT_MINIMUM_FUEL_EMERGENCY = 3; /* | */ + public static final int UAVIONIX_ADSB_OUT_NO_COMM_EMERGENCY = 4; /* | */ + public static final int UAVIONIX_ADSB_OUT_UNLAWFUL_INTERFERANCE_EMERGENCY = 5; /* | */ + public static final int UAVIONIX_ADSB_OUT_DOWNED_AIRCRAFT_EMERGENCY = 6; /* | */ + public static final int UAVIONIX_ADSB_OUT_RESERVED = 7; /* | */ + public static final int UAVIONIX_ADSB_EMERGENCY_STATUS_ENUM_END = 8; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE.java b/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE.java index f5bd4fd..e0ad324 100644 --- a/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE.java +++ b/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE.java @@ -6,26 +6,26 @@ package com.MAVLink.enums; -/** -* Definitions for aircraft size -*/ +/** + * Definitions for aircraft size + */ public class UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE { - public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_NO_DATA = 0; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L15M_W23M = 1; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L25M_W28P5M = 2; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L25_34M = 3; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L35_33M = 4; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L35_38M = 5; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L45_39P5M = 6; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L45_45M = 7; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L55_45M = 8; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L55_52M = 9; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L65_59P5M = 10; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L65_67M = 11; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L75_W72P5M = 12; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L75_W80M = 13; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L85_W80M = 14; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L85_W90M = 15; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_ENUM_END = 16; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_NO_DATA = 0; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L15M_W23M = 1; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L25M_W28P5M = 2; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L25_34M = 3; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L35_33M = 4; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L35_38M = 5; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L45_39P5M = 6; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L45_45M = 7; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L55_45M = 8; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L55_52M = 9; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L65_59P5M = 10; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L65_67M = 11; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L75_W72P5M = 12; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L75_W80M = 13; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L85_W80M = 14; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_L85_W90M = 15; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_AIRCRAFT_SIZE_ENUM_END = 16; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT.java b/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT.java index 71afc67..962833a 100644 --- a/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT.java +++ b/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT.java @@ -6,18 +6,18 @@ package com.MAVLink.enums; -/** -* GPS lataral offset encoding -*/ +/** + * GPS lataral offset encoding + */ public class UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT { - public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT_NO_DATA = 0; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT_LEFT_2M = 1; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT_LEFT_4M = 2; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT_LEFT_6M = 3; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT_RIGHT_0M = 4; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT_RIGHT_2M = 5; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT_RIGHT_4M = 6; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT_RIGHT_6M = 7; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT_ENUM_END = 8; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT_NO_DATA = 0; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT_LEFT_2M = 1; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT_LEFT_4M = 2; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT_LEFT_6M = 3; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT_RIGHT_0M = 4; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT_RIGHT_2M = 5; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT_RIGHT_4M = 6; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT_RIGHT_6M = 7; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LAT_ENUM_END = 8; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LON.java b/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LON.java index ee95a3b..3446148 100644 --- a/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LON.java +++ b/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LON.java @@ -6,12 +6,12 @@ package com.MAVLink.enums; -/** -* GPS longitudinal offset encoding -*/ +/** + * GPS longitudinal offset encoding + */ public class UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LON { - public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LON_NO_DATA = 0; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LON_APPLIED_BY_SENSOR = 1; /* | */ - public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LON_ENUM_END = 2; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LON_NO_DATA = 0; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LON_APPLIED_BY_SENSOR = 1; /* | */ + public static final int UAVIONIX_ADSB_OUT_CFG_GPS_OFFSET_LON_ENUM_END = 2; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_DYNAMIC_GPS_FIX.java b/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_DYNAMIC_GPS_FIX.java index 73938bd..d001feb 100644 --- a/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_DYNAMIC_GPS_FIX.java +++ b/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_DYNAMIC_GPS_FIX.java @@ -6,16 +6,16 @@ package com.MAVLink.enums; -/** -* Status for ADS-B transponder dynamic input -*/ +/** + * Status for ADS-B transponder dynamic input + */ public class UAVIONIX_ADSB_OUT_DYNAMIC_GPS_FIX { - public static final int UAVIONIX_ADSB_OUT_DYNAMIC_GPS_FIX_NONE_0 = 0; /* | */ - public static final int UAVIONIX_ADSB_OUT_DYNAMIC_GPS_FIX_NONE_1 = 1; /* | */ - public static final int UAVIONIX_ADSB_OUT_DYNAMIC_GPS_FIX_2D = 2; /* | */ - public static final int UAVIONIX_ADSB_OUT_DYNAMIC_GPS_FIX_3D = 3; /* | */ - public static final int UAVIONIX_ADSB_OUT_DYNAMIC_GPS_FIX_DGPS = 4; /* | */ - public static final int UAVIONIX_ADSB_OUT_DYNAMIC_GPS_FIX_RTK = 5; /* | */ - public static final int UAVIONIX_ADSB_OUT_DYNAMIC_GPS_FIX_ENUM_END = 6; /* | */ + public static final int UAVIONIX_ADSB_OUT_DYNAMIC_GPS_FIX_NONE_0 = 0; /* | */ + public static final int UAVIONIX_ADSB_OUT_DYNAMIC_GPS_FIX_NONE_1 = 1; /* | */ + public static final int UAVIONIX_ADSB_OUT_DYNAMIC_GPS_FIX_2D = 2; /* | */ + public static final int UAVIONIX_ADSB_OUT_DYNAMIC_GPS_FIX_3D = 3; /* | */ + public static final int UAVIONIX_ADSB_OUT_DYNAMIC_GPS_FIX_DGPS = 4; /* | */ + public static final int UAVIONIX_ADSB_OUT_DYNAMIC_GPS_FIX_RTK = 5; /* | */ + public static final int UAVIONIX_ADSB_OUT_DYNAMIC_GPS_FIX_ENUM_END = 6; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_DYNAMIC_STATE.java b/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_DYNAMIC_STATE.java index a0d9456..729c384 100644 --- a/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_DYNAMIC_STATE.java +++ b/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_DYNAMIC_STATE.java @@ -6,15 +6,15 @@ package com.MAVLink.enums; -/** -* State flags for ADS-B transponder dynamic report -*/ +/** + * State flags for ADS-B transponder dynamic report + */ public class UAVIONIX_ADSB_OUT_DYNAMIC_STATE { - public static final int UAVIONIX_ADSB_OUT_DYNAMIC_STATE_INTENT_CHANGE = 1; /* | */ - public static final int UAVIONIX_ADSB_OUT_DYNAMIC_STATE_AUTOPILOT_ENABLED = 2; /* | */ - public static final int UAVIONIX_ADSB_OUT_DYNAMIC_STATE_NICBARO_CROSSCHECKED = 4; /* | */ - public static final int UAVIONIX_ADSB_OUT_DYNAMIC_STATE_ON_GROUND = 8; /* | */ - public static final int UAVIONIX_ADSB_OUT_DYNAMIC_STATE_IDENT = 16; /* | */ - public static final int UAVIONIX_ADSB_OUT_DYNAMIC_STATE_ENUM_END = 17; /* | */ + public static final int UAVIONIX_ADSB_OUT_DYNAMIC_STATE_INTENT_CHANGE = 1; /* | */ + public static final int UAVIONIX_ADSB_OUT_DYNAMIC_STATE_AUTOPILOT_ENABLED = 2; /* | */ + public static final int UAVIONIX_ADSB_OUT_DYNAMIC_STATE_NICBARO_CROSSCHECKED = 4; /* | */ + public static final int UAVIONIX_ADSB_OUT_DYNAMIC_STATE_ON_GROUND = 8; /* | */ + public static final int UAVIONIX_ADSB_OUT_DYNAMIC_STATE_IDENT = 16; /* | */ + public static final int UAVIONIX_ADSB_OUT_DYNAMIC_STATE_ENUM_END = 17; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_RF_SELECT.java b/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_RF_SELECT.java index 2333724..2e801fb 100644 --- a/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_RF_SELECT.java +++ b/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_OUT_RF_SELECT.java @@ -6,13 +6,13 @@ package com.MAVLink.enums; -/** -* Transceiver RF control flags for ADS-B transponder dynamic reports -*/ +/** + * Transceiver RF control flags for ADS-B transponder dynamic reports + */ public class UAVIONIX_ADSB_OUT_RF_SELECT { - public static final int UAVIONIX_ADSB_OUT_RF_SELECT_STANDBY = 0; /* | */ - public static final int UAVIONIX_ADSB_OUT_RF_SELECT_RX_ENABLED = 1; /* | */ - public static final int UAVIONIX_ADSB_OUT_RF_SELECT_TX_ENABLED = 2; /* | */ - public static final int UAVIONIX_ADSB_OUT_RF_SELECT_ENUM_END = 3; /* | */ + public static final int UAVIONIX_ADSB_OUT_RF_SELECT_STANDBY = 0; /* | */ + public static final int UAVIONIX_ADSB_OUT_RF_SELECT_RX_ENABLED = 1; /* | */ + public static final int UAVIONIX_ADSB_OUT_RF_SELECT_TX_ENABLED = 2; /* | */ + public static final int UAVIONIX_ADSB_OUT_RF_SELECT_ENUM_END = 3; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_RF_HEALTH.java b/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_RF_HEALTH.java index 4252f37..b4776f1 100644 --- a/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_RF_HEALTH.java +++ b/app/src/main/java/com/MAVLink/enums/UAVIONIX_ADSB_RF_HEALTH.java @@ -6,14 +6,14 @@ package com.MAVLink.enums; -/** -* Status flags for ADS-B transponder dynamic output -*/ +/** + * Status flags for ADS-B transponder dynamic output + */ public class UAVIONIX_ADSB_RF_HEALTH { - public static final int UAVIONIX_ADSB_RF_HEALTH_INITIALIZING = 0; /* | */ - public static final int UAVIONIX_ADSB_RF_HEALTH_OK = 1; /* | */ - public static final int UAVIONIX_ADSB_RF_HEALTH_FAIL_TX = 2; /* | */ - public static final int UAVIONIX_ADSB_RF_HEALTH_FAIL_RX = 16; /* | */ - public static final int UAVIONIX_ADSB_RF_HEALTH_ENUM_END = 17; /* | */ + public static final int UAVIONIX_ADSB_RF_HEALTH_INITIALIZING = 0; /* | */ + public static final int UAVIONIX_ADSB_RF_HEALTH_OK = 1; /* | */ + public static final int UAVIONIX_ADSB_RF_HEALTH_FAIL_TX = 2; /* | */ + public static final int UAVIONIX_ADSB_RF_HEALTH_FAIL_RX = 16; /* | */ + public static final int UAVIONIX_ADSB_RF_HEALTH_ENUM_END = 17; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/UTM_DATA_AVAIL_FLAGS.java b/app/src/main/java/com/MAVLink/enums/UTM_DATA_AVAIL_FLAGS.java index abd1c00..0e4b5a2 100644 --- a/app/src/main/java/com/MAVLink/enums/UTM_DATA_AVAIL_FLAGS.java +++ b/app/src/main/java/com/MAVLink/enums/UTM_DATA_AVAIL_FLAGS.java @@ -6,18 +6,18 @@ package com.MAVLink.enums; -/** -* Flags for the global position report. -*/ +/** + * Flags for the global position report. + */ public class UTM_DATA_AVAIL_FLAGS { - public static final int UTM_DATA_AVAIL_FLAGS_TIME_VALID = 1; /* The field time contains valid data. | */ - public static final int UTM_DATA_AVAIL_FLAGS_UAS_ID_AVAILABLE = 2; /* The field uas_id contains valid data. | */ - public static final int UTM_DATA_AVAIL_FLAGS_POSITION_AVAILABLE = 4; /* The fields lat, lon and h_acc contain valid data. | */ - public static final int UTM_DATA_AVAIL_FLAGS_ALTITUDE_AVAILABLE = 8; /* The fields alt and v_acc contain valid data. | */ - public static final int UTM_DATA_AVAIL_FLAGS_RELATIVE_ALTITUDE_AVAILABLE = 16; /* The field relative_alt contains valid data. | */ - public static final int UTM_DATA_AVAIL_FLAGS_HORIZONTAL_VELO_AVAILABLE = 32; /* The fields vx and vy contain valid data. | */ - public static final int UTM_DATA_AVAIL_FLAGS_VERTICAL_VELO_AVAILABLE = 64; /* The field vz contains valid data. | */ - public static final int UTM_DATA_AVAIL_FLAGS_NEXT_WAYPOINT_AVAILABLE = 128; /* The fields next_lat, next_lon and next_alt contain valid data. | */ - public static final int UTM_DATA_AVAIL_FLAGS_ENUM_END = 129; /* | */ + public static final int UTM_DATA_AVAIL_FLAGS_TIME_VALID = 1; /* The field time contains valid data. | */ + public static final int UTM_DATA_AVAIL_FLAGS_UAS_ID_AVAILABLE = 2; /* The field uas_id contains valid data. | */ + public static final int UTM_DATA_AVAIL_FLAGS_POSITION_AVAILABLE = 4; /* The fields lat, lon and h_acc contain valid data. | */ + public static final int UTM_DATA_AVAIL_FLAGS_ALTITUDE_AVAILABLE = 8; /* The fields alt and v_acc contain valid data. | */ + public static final int UTM_DATA_AVAIL_FLAGS_RELATIVE_ALTITUDE_AVAILABLE = 16; /* The field relative_alt contains valid data. | */ + public static final int UTM_DATA_AVAIL_FLAGS_HORIZONTAL_VELO_AVAILABLE = 32; /* The fields vx and vy contain valid data. | */ + public static final int UTM_DATA_AVAIL_FLAGS_VERTICAL_VELO_AVAILABLE = 64; /* The field vz contains valid data. | */ + public static final int UTM_DATA_AVAIL_FLAGS_NEXT_WAYPOINT_AVAILABLE = 128; /* The fields next_lat, next_lon and next_alt contain valid data. | */ + public static final int UTM_DATA_AVAIL_FLAGS_ENUM_END = 129; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/UTM_FLIGHT_STATE.java b/app/src/main/java/com/MAVLink/enums/UTM_FLIGHT_STATE.java index 40c4ed8..cd548ca 100644 --- a/app/src/main/java/com/MAVLink/enums/UTM_FLIGHT_STATE.java +++ b/app/src/main/java/com/MAVLink/enums/UTM_FLIGHT_STATE.java @@ -6,15 +6,15 @@ package com.MAVLink.enums; -/** -* Airborne status of UAS. -*/ +/** + * Airborne status of UAS. + */ public class UTM_FLIGHT_STATE { - public static final int UTM_FLIGHT_STATE_UNKNOWN = 1; /* The flight state can't be determined. | */ - public static final int UTM_FLIGHT_STATE_GROUND = 2; /* UAS on ground. | */ - public static final int UTM_FLIGHT_STATE_AIRBORNE = 3; /* UAS airborne. | */ - public static final int UTM_FLIGHT_STATE_EMERGENCY = 16; /* UAS is in an emergency flight state. | */ - public static final int UTM_FLIGHT_STATE_NOCTRL = 32; /* UAS has no active controls. | */ - public static final int UTM_FLIGHT_STATE_ENUM_END = 33; /* | */ + public static final int UTM_FLIGHT_STATE_UNKNOWN = 1; /* The flight state can't be determined. | */ + public static final int UTM_FLIGHT_STATE_GROUND = 2; /* UAS on ground. | */ + public static final int UTM_FLIGHT_STATE_AIRBORNE = 3; /* UAS airborne. | */ + public static final int UTM_FLIGHT_STATE_EMERGENCY = 16; /* UAS is in an emergency flight state. | */ + public static final int UTM_FLIGHT_STATE_NOCTRL = 32; /* UAS has no active controls. | */ + public static final int UTM_FLIGHT_STATE_ENUM_END = 33; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/VIDEO_STREAM_STATUS_FLAGS.java b/app/src/main/java/com/MAVLink/enums/VIDEO_STREAM_STATUS_FLAGS.java index 20de0f5..741ca9a 100644 --- a/app/src/main/java/com/MAVLink/enums/VIDEO_STREAM_STATUS_FLAGS.java +++ b/app/src/main/java/com/MAVLink/enums/VIDEO_STREAM_STATUS_FLAGS.java @@ -6,12 +6,12 @@ package com.MAVLink.enums; -/** -* Stream status flags (Bitmap) -*/ +/** + * Stream status flags (Bitmap) + */ public class VIDEO_STREAM_STATUS_FLAGS { - public static final int VIDEO_STREAM_STATUS_FLAGS_RUNNING = 1; /* Stream is active (running) | */ - public static final int VIDEO_STREAM_STATUS_FLAGS_THERMAL = 2; /* Stream is thermal imaging | */ - public static final int VIDEO_STREAM_STATUS_FLAGS_ENUM_END = 3; /* | */ + public static final int VIDEO_STREAM_STATUS_FLAGS_RUNNING = 1; /* Stream is active (running) | */ + public static final int VIDEO_STREAM_STATUS_FLAGS_THERMAL = 2; /* Stream is thermal imaging | */ + public static final int VIDEO_STREAM_STATUS_FLAGS_ENUM_END = 3; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/VIDEO_STREAM_TYPE.java b/app/src/main/java/com/MAVLink/enums/VIDEO_STREAM_TYPE.java index 044fb92..567a11b 100644 --- a/app/src/main/java/com/MAVLink/enums/VIDEO_STREAM_TYPE.java +++ b/app/src/main/java/com/MAVLink/enums/VIDEO_STREAM_TYPE.java @@ -6,14 +6,14 @@ package com.MAVLink.enums; -/** -* Video stream types -*/ +/** + * Video stream types + */ public class VIDEO_STREAM_TYPE { - public static final int VIDEO_STREAM_TYPE_RTSP = 0; /* Stream is RTSP | */ - public static final int VIDEO_STREAM_TYPE_RTPUDP = 1; /* Stream is RTP UDP (URI gives the port number) | */ - public static final int VIDEO_STREAM_TYPE_TCP_MPEG = 2; /* Stream is MPEG on TCP | */ - public static final int VIDEO_STREAM_TYPE_MPEG_TS_H264 = 3; /* Stream is h.264 on MPEG TS (URI gives the port number) | */ - public static final int VIDEO_STREAM_TYPE_ENUM_END = 4; /* | */ + public static final int VIDEO_STREAM_TYPE_RTSP = 0; /* Stream is RTSP | */ + public static final int VIDEO_STREAM_TYPE_RTPUDP = 1; /* Stream is RTP UDP (URI gives the port number) | */ + public static final int VIDEO_STREAM_TYPE_TCP_MPEG = 2; /* Stream is MPEG on TCP | */ + public static final int VIDEO_STREAM_TYPE_MPEG_TS_H264 = 3; /* Stream is h.264 on MPEG TS (URI gives the port number) | */ + public static final int VIDEO_STREAM_TYPE_ENUM_END = 4; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/VTOL_TRANSITION_HEADING.java b/app/src/main/java/com/MAVLink/enums/VTOL_TRANSITION_HEADING.java index ec13138..1217d41 100644 --- a/app/src/main/java/com/MAVLink/enums/VTOL_TRANSITION_HEADING.java +++ b/app/src/main/java/com/MAVLink/enums/VTOL_TRANSITION_HEADING.java @@ -6,15 +6,15 @@ package com.MAVLink.enums; -/** -* Direction of VTOL transition -*/ +/** + * Direction of VTOL transition + */ public class VTOL_TRANSITION_HEADING { - public static final int VTOL_TRANSITION_HEADING_VEHICLE_DEFAULT = 0; /* Respect the heading configuration of the vehicle. | */ - public static final int VTOL_TRANSITION_HEADING_NEXT_WAYPOINT = 1; /* Use the heading pointing towards the next waypoint. | */ - public static final int VTOL_TRANSITION_HEADING_TAKEOFF = 2; /* Use the heading on takeoff (while sitting on the ground). | */ - public static final int VTOL_TRANSITION_HEADING_SPECIFIED = 3; /* Use the specified heading in parameter 4. | */ - public static final int VTOL_TRANSITION_HEADING_ANY = 4; /* Use the current heading when reaching takeoff altitude (potentially facing the wind when weather-vaning is active). | */ - public static final int VTOL_TRANSITION_HEADING_ENUM_END = 5; /* | */ + public static final int VTOL_TRANSITION_HEADING_VEHICLE_DEFAULT = 0; /* Respect the heading configuration of the vehicle. | */ + public static final int VTOL_TRANSITION_HEADING_NEXT_WAYPOINT = 1; /* Use the heading pointing towards the next waypoint. | */ + public static final int VTOL_TRANSITION_HEADING_TAKEOFF = 2; /* Use the heading on takeoff (while sitting on the ground). | */ + public static final int VTOL_TRANSITION_HEADING_SPECIFIED = 3; /* Use the specified heading in parameter 4. | */ + public static final int VTOL_TRANSITION_HEADING_ANY = 4; /* Use the current heading when reaching takeoff altitude (potentially facing the wind when weather-vaning is active). | */ + public static final int VTOL_TRANSITION_HEADING_ENUM_END = 5; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/enums/WINCH_ACTIONS.java b/app/src/main/java/com/MAVLink/enums/WINCH_ACTIONS.java index 3be7083..26c2e3f 100644 --- a/app/src/main/java/com/MAVLink/enums/WINCH_ACTIONS.java +++ b/app/src/main/java/com/MAVLink/enums/WINCH_ACTIONS.java @@ -6,13 +6,13 @@ package com.MAVLink.enums; -/** -* Winch actions. -*/ +/** + * Winch actions. + */ public class WINCH_ACTIONS { - public static final int WINCH_RELAXED = 0; /* Relax winch. | */ - public static final int WINCH_RELATIVE_LENGTH_CONTROL = 1; /* Winch unwinds or winds specified length of cable optionally using specified rate. | */ - public static final int WINCH_RATE_CONTROL = 2; /* Winch unwinds or winds cable at specified rate in meters/seconds. | */ - public static final int WINCH_ACTIONS_ENUM_END = 3; /* | */ + public static final int WINCH_RELAXED = 0; /* Relax winch. | */ + public static final int WINCH_RELATIVE_LENGTH_CONTROL = 1; /* Winch unwinds or winds specified length of cable optionally using specified rate. | */ + public static final int WINCH_RATE_CONTROL = 2; /* Winch unwinds or winds cable at specified rate in meters/seconds. | */ + public static final int WINCH_ACTIONS_ENUM_END = 3; /* | */ } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/icarous/CRC.java b/app/src/main/java/com/MAVLink/icarous/CRC.java index 4cb0139..133a9bc 100644 --- a/app/src/main/java/com/MAVLink/icarous/CRC.java +++ b/app/src/main/java/com/MAVLink/icarous/CRC.java @@ -7,26 +7,24 @@ package com.MAVLink.icarous; /** -* X.25 CRC calculation for MAVlink messages. The checksum must be initialized, -* updated with witch field of the message, and then finished with the message -* id. -* -*/ + * X.25 CRC calculation for MAVlink messages. The checksum must be initialized, + * updated with witch field of the message, and then finished with the message + * id. + */ public class CRC { private static final int[] MAVLINK_MESSAGE_CRCS = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; private static final int CRC_INIT_VALUE = 0xffff; private int crcValue; /** - * Accumulate the X.25 CRC by adding one char at a time. - * - * The checksum function adds the hash of one char at a time to the 16 bit - * checksum (uint16_t). - * - * @param data - * new char to hash - **/ - public void update_checksum(int data) { + * Accumulate the X.25 CRC by adding one char at a time. + *

+ * The checksum function adds the hash of one char at a time to the 16 bit + * checksum (uint16_t). + * + * @param data new char to hash + **/ + public void update_checksum(int data) { data = data & 0xff; //cast because we want an unsigned type int tmp = data ^ (crcValue & 0xff); tmp ^= (tmp << 4) & 0xff; @@ -34,20 +32,18 @@ public class CRC { } /** - * Finish the CRC calculation of a message, by running the CRC with the - * Magic Byte. This Magic byte has been defined in MAVlink v1.0. - * - * @param msgid - * The message id number - */ + * Finish the CRC calculation of a message, by running the CRC with the + * Magic Byte. This Magic byte has been defined in MAVlink v1.0. + * + * @param msgid The message id number + */ public void finish_checksum(int msgid) { update_checksum(MAVLINK_MESSAGE_CRCS[msgid]); } /** - * Initialize the buffer for the X.25 CRC - * - */ + * Initialize the buffer for the X.25 CRC + */ public void start_checksum() { crcValue = CRC_INIT_VALUE; } diff --git a/app/src/main/java/com/MAVLink/icarous/msg_icarous_heartbeat.java b/app/src/main/java/com/MAVLink/icarous/msg_icarous_heartbeat.java index 2a0a161..137cacc 100644 --- a/app/src/main/java/com/MAVLink/icarous/msg_icarous_heartbeat.java +++ b/app/src/main/java/com/MAVLink/icarous/msg_icarous_heartbeat.java @@ -6,79 +6,79 @@ // MESSAGE ICAROUS_HEARTBEAT PACKING package com.MAVLink.icarous; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* ICAROUS heartbeat -*/ -public class msg_icarous_heartbeat extends MAVLinkMessage{ + * ICAROUS heartbeat + */ +public class msg_icarous_heartbeat extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_ICAROUS_HEARTBEAT = 42000; public static final int MAVLINK_MSG_LENGTH = 1; private static final long serialVersionUID = MAVLINK_MSG_ID_ICAROUS_HEARTBEAT; - /** - * See the FMS_STATE enum. - */ + * See the FMS_STATE enum. + */ public short status; - + /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_ICAROUS_HEARTBEAT; - + packet.payload.putUnsignedByte(status); - + return packet; } /** - * Decode a icarous_heartbeat message into this class fields - * - * @param payload The message to decode - */ + * Decode a icarous_heartbeat message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.status = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_icarous_heartbeat(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_icarous_heartbeat() { msgid = MAVLINK_MSG_ID_ICAROUS_HEARTBEAT; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_icarous_heartbeat(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_icarous_heartbeat(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_ICAROUS_HEARTBEAT; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_ICAROUS_HEARTBEAT - sysid:"+sysid+" compid:"+compid+" status:"+status+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_ICAROUS_HEARTBEAT - sysid:" + sysid + " compid:" + compid + " status:" + status + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/icarous/msg_icarous_kinematic_bands.java b/app/src/main/java/com/MAVLink/icarous/msg_icarous_kinematic_bands.java index 9c933be..27a9468 100644 --- a/app/src/main/java/com/MAVLink/icarous/msg_icarous_kinematic_bands.java +++ b/app/src/main/java/com/MAVLink/icarous/msg_icarous_kinematic_bands.java @@ -6,214 +6,214 @@ // MESSAGE ICAROUS_KINEMATIC_BANDS PACKING package com.MAVLink.icarous; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Kinematic multi bands (track) output from Daidalus -*/ -public class msg_icarous_kinematic_bands extends MAVLinkMessage{ + * Kinematic multi bands (track) output from Daidalus + */ +public class msg_icarous_kinematic_bands extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_ICAROUS_KINEMATIC_BANDS = 42001; public static final int MAVLINK_MSG_LENGTH = 46; private static final long serialVersionUID = MAVLINK_MSG_ID_ICAROUS_KINEMATIC_BANDS; - /** - * min angle (degrees) - */ + * min angle (degrees) + */ public float min1; - - /** - * max angle (degrees) - */ - public float max1; - - /** - * min angle (degrees) - */ - public float min2; - - /** - * max angle (degrees) - */ - public float max2; - - /** - * min angle (degrees) - */ - public float min3; - - /** - * max angle (degrees) - */ - public float max3; - - /** - * min angle (degrees) - */ - public float min4; - - /** - * max angle (degrees) - */ - public float max4; - - /** - * min angle (degrees) - */ - public float min5; - - /** - * max angle (degrees) - */ - public float max5; - - /** - * Number of track bands - */ - public byte numBands; - - /** - * See the TRACK_BAND_TYPES enum. - */ - public short type1; - - /** - * See the TRACK_BAND_TYPES enum. - */ - public short type2; - - /** - * See the TRACK_BAND_TYPES enum. - */ - public short type3; - - /** - * See the TRACK_BAND_TYPES enum. - */ - public short type4; - - /** - * See the TRACK_BAND_TYPES enum. - */ - public short type5; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * max angle (degrees) + */ + public float max1; + + /** + * min angle (degrees) + */ + public float min2; + + /** + * max angle (degrees) + */ + public float max2; + + /** + * min angle (degrees) + */ + public float min3; + + /** + * max angle (degrees) + */ + public float max3; + + /** + * min angle (degrees) + */ + public float min4; + + /** + * max angle (degrees) + */ + public float max4; + + /** + * min angle (degrees) + */ + public float min5; + + /** + * max angle (degrees) + */ + public float max5; + + /** + * Number of track bands + */ + public byte numBands; + + /** + * See the TRACK_BAND_TYPES enum. + */ + public short type1; + + /** + * See the TRACK_BAND_TYPES enum. + */ + public short type2; + + /** + * See the TRACK_BAND_TYPES enum. + */ + public short type3; + + /** + * See the TRACK_BAND_TYPES enum. + */ + public short type4; + + /** + * See the TRACK_BAND_TYPES enum. + */ + public short type5; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_ICAROUS_KINEMATIC_BANDS; - + packet.payload.putFloat(min1); - + packet.payload.putFloat(max1); - + packet.payload.putFloat(min2); - + packet.payload.putFloat(max2); - + packet.payload.putFloat(min3); - + packet.payload.putFloat(max3); - + packet.payload.putFloat(min4); - + packet.payload.putFloat(max4); - + packet.payload.putFloat(min5); - + packet.payload.putFloat(max5); - + packet.payload.putByte(numBands); - + packet.payload.putUnsignedByte(type1); - + packet.payload.putUnsignedByte(type2); - + packet.payload.putUnsignedByte(type3); - + packet.payload.putUnsignedByte(type4); - + packet.payload.putUnsignedByte(type5); - + return packet; } /** - * Decode a icarous_kinematic_bands message into this class fields - * - * @param payload The message to decode - */ + * Decode a icarous_kinematic_bands message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.min1 = payload.getFloat(); - + this.max1 = payload.getFloat(); - + this.min2 = payload.getFloat(); - + this.max2 = payload.getFloat(); - + this.min3 = payload.getFloat(); - + this.max3 = payload.getFloat(); - + this.min4 = payload.getFloat(); - + this.max4 = payload.getFloat(); - + this.min5 = payload.getFloat(); - + this.max5 = payload.getFloat(); - + this.numBands = payload.getByte(); - + this.type1 = payload.getUnsignedByte(); - + this.type2 = payload.getUnsignedByte(); - + this.type3 = payload.getUnsignedByte(); - + this.type4 = payload.getUnsignedByte(); - + this.type5 = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_icarous_kinematic_bands(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_icarous_kinematic_bands() { msgid = MAVLINK_MSG_ID_ICAROUS_KINEMATIC_BANDS; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_icarous_kinematic_bands(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_icarous_kinematic_bands(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_ICAROUS_KINEMATIC_BANDS; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Returns a string with the MSG name and data - */ - public String toString(){ - return "MAVLINK_MSG_ID_ICAROUS_KINEMATIC_BANDS - sysid:"+sysid+" compid:"+compid+" min1:"+min1+" max1:"+max1+" min2:"+min2+" max2:"+max2+" min3:"+min3+" max3:"+max3+" min4:"+min4+" max4:"+max4+" min5:"+min5+" max5:"+max5+" numBands:"+numBands+" type1:"+type1+" type2:"+type2+" type3:"+type3+" type4:"+type4+" type5:"+type5+""; + * Returns a string with the MSG name and data + */ + public String toString() { + return "MAVLINK_MSG_ID_ICAROUS_KINEMATIC_BANDS - sysid:" + sysid + " compid:" + compid + " min1:" + min1 + " max1:" + max1 + " min2:" + min2 + " max2:" + max2 + " min3:" + min3 + " max3:" + max3 + " min4:" + min4 + " max4:" + max4 + " min5:" + min5 + " max5:" + max5 + " numBands:" + numBands + " type1:" + type1 + " type2:" + type2 + " type3:" + type3 + " type4:" + type4 + " type5:" + type5 + ""; } } \ No newline at end of file diff --git a/app/src/main/java/com/MAVLink/uAvionix/CRC.java b/app/src/main/java/com/MAVLink/uAvionix/CRC.java index f1dc589..ff8c777 100644 --- a/app/src/main/java/com/MAVLink/uAvionix/CRC.java +++ b/app/src/main/java/com/MAVLink/uAvionix/CRC.java @@ -7,26 +7,24 @@ package com.MAVLink.uAvionix; /** -* X.25 CRC calculation for MAVlink messages. The checksum must be initialized, -* updated with witch field of the message, and then finished with the message -* id. -* -*/ + * X.25 CRC calculation for MAVlink messages. The checksum must be initialized, + * updated with witch field of the message, and then finished with the message + * id. + */ public class CRC { private static final int[] MAVLINK_MESSAGE_CRCS = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; private static final int CRC_INIT_VALUE = 0xffff; private int crcValue; /** - * Accumulate the X.25 CRC by adding one char at a time. - * - * The checksum function adds the hash of one char at a time to the 16 bit - * checksum (uint16_t). - * - * @param data - * new char to hash - **/ - public void update_checksum(int data) { + * Accumulate the X.25 CRC by adding one char at a time. + *

+ * The checksum function adds the hash of one char at a time to the 16 bit + * checksum (uint16_t). + * + * @param data new char to hash + **/ + public void update_checksum(int data) { data = data & 0xff; //cast because we want an unsigned type int tmp = data ^ (crcValue & 0xff); tmp ^= (tmp << 4) & 0xff; @@ -34,20 +32,18 @@ public class CRC { } /** - * Finish the CRC calculation of a message, by running the CRC with the - * Magic Byte. This Magic byte has been defined in MAVlink v1.0. - * - * @param msgid - * The message id number - */ + * Finish the CRC calculation of a message, by running the CRC with the + * Magic Byte. This Magic byte has been defined in MAVlink v1.0. + * + * @param msgid The message id number + */ public void finish_checksum(int msgid) { update_checksum(MAVLINK_MESSAGE_CRCS[msgid]); } /** - * Initialize the buffer for the X.25 CRC - * - */ + * Initialize the buffer for the X.25 CRC + */ public void start_checksum() { crcValue = CRC_INIT_VALUE; } diff --git a/app/src/main/java/com/MAVLink/uAvionix/msg_uavionix_adsb_out_cfg.java b/app/src/main/java/com/MAVLink/uAvionix/msg_uavionix_adsb_out_cfg.java index a2ea2e6..ccb8314 100644 --- a/app/src/main/java/com/MAVLink/uAvionix/msg_uavionix_adsb_out_cfg.java +++ b/app/src/main/java/com/MAVLink/uAvionix/msg_uavionix_adsb_out_cfg.java @@ -6,162 +6,162 @@ // MESSAGE UAVIONIX_ADSB_OUT_CFG PACKING package com.MAVLink.uAvionix; + import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Messages.MAVLinkPayload; - + /** -* Static data to configure the ADS-B transponder (send within 10 sec of a POR and every 10 sec thereafter) -*/ -public class msg_uavionix_adsb_out_cfg extends MAVLinkMessage{ + * Static data to configure the ADS-B transponder (send within 10 sec of a POR and every 10 sec thereafter) + */ +public class msg_uavionix_adsb_out_cfg extends MAVLinkMessage { public static final int MAVLINK_MSG_ID_UAVIONIX_ADSB_OUT_CFG = 10001; public static final int MAVLINK_MSG_LENGTH = 20; private static final long serialVersionUID = MAVLINK_MSG_ID_UAVIONIX_ADSB_OUT_CFG; - /** - * Vehicle address (24 bit) - */ + * Vehicle address (24 bit) + */ public long ICAO; - - /** - * Aircraft stall speed in cm/s - */ - public int stallSpeed; - - /** - * Vehicle identifier (8 characters, null terminated, valid characters are A-Z, 0-9, " " only) - */ - public byte callsign[] = new byte[9]; - - /** - * Transmitting vehicle type. See ADSB_EMITTER_TYPE enum - */ - public short emitterType; - - /** - * Aircraft length and width encoding (table 2-35 of DO-282B) - */ - public short aircraftSize; - - /** - * GPS antenna lateral offset (table 2-36 of DO-282B) - */ - public short gpsOffsetLat; - - /** - * GPS antenna longitudinal offset from nose [if non-zero, take position (in meters) divide by 2 and add one] (table 2-37 DO-282B) - */ - public short gpsOffsetLon; - - /** - * ADS-B transponder reciever and transmit enable flags - */ - public short rfSelect; - /** - * Generates the payload for a mavlink message for a message of this type - * @return - */ - public MAVLinkPacket pack(){ + * Aircraft stall speed in cm/s + */ + public int stallSpeed; + + /** + * Vehicle identifier (8 characters, null terminated, valid characters are A-Z, 0-9, " " only) + */ + public byte callsign[] = new byte[9]; + + /** + * Transmitting vehicle type. See ADSB_EMITTER_TYPE enum + */ + public short emitterType; + + /** + * Aircraft length and width encoding (table 2-35 of DO-282B) + */ + public short aircraftSize; + + /** + * GPS antenna lateral offset (table 2-36 of DO-282B) + */ + public short gpsOffsetLat; + + /** + * GPS antenna longitudinal offset from nose [if non-zero, take position (in meters) divide by 2 and add one] (table 2-37 DO-282B) + */ + public short gpsOffsetLon; + + /** + * ADS-B transponder reciever and transmit enable flags + */ + public short rfSelect; + + + /** + * Generates the payload for a mavlink message for a message of this type + * + * @return + */ + public MAVLinkPacket pack() { MAVLinkPacket packet = new MAVLinkPacket(MAVLINK_MSG_LENGTH); packet.sysid = 255; packet.compid = 190; packet.msgid = MAVLINK_MSG_ID_UAVIONIX_ADSB_OUT_CFG; - + packet.payload.putUnsignedInt(ICAO); - + packet.payload.putUnsignedShort(stallSpeed); - - + + for (int i = 0; i < callsign.length; i++) { packet.payload.putByte(callsign[i]); } - - + + packet.payload.putUnsignedByte(emitterType); - + packet.payload.putUnsignedByte(aircraftSize); - + packet.payload.putUnsignedByte(gpsOffsetLat); - + packet.payload.putUnsignedByte(gpsOffsetLon); - + packet.payload.putUnsignedByte(rfSelect); - + return packet; } /** - * Decode a uavionix_adsb_out_cfg message into this class fields - * - * @param payload The message to decode - */ + * Decode a uavionix_adsb_out_cfg message into this class fields + * + * @param payload The message to decode + */ public void unpack(MAVLinkPayload payload) { payload.resetIndex(); - + this.ICAO = payload.getUnsignedInt(); - + this.stallSpeed = payload.getUnsignedShort(); - - + + for (int i = 0; i < this.callsign.length; i++) { this.callsign[i] = payload.getByte(); } - - + + this.emitterType = payload.getUnsignedByte(); - + this.aircraftSize = payload.getUnsignedByte(); - + this.gpsOffsetLat = payload.getUnsignedByte(); - + this.gpsOffsetLon = payload.getUnsignedByte(); - + this.rfSelect = payload.getUnsignedByte(); - + } /** - * Constructor for a new message, just initializes the msgid - */ - public msg_uavionix_adsb_out_cfg(){ + * Constructor for a new message, just initializes the msgid + */ + public msg_uavionix_adsb_out_cfg() { msgid = MAVLINK_MSG_ID_UAVIONIX_ADSB_OUT_CFG; } /** - * Constructor for a new message, initializes the message with the payload - * from a mavlink packet - * - */ - public msg_uavionix_adsb_out_cfg(MAVLinkPacket mavLinkPacket){ + * Constructor for a new message, initializes the message with the payload + * from a mavlink packet + */ + public msg_uavionix_adsb_out_cfg(MAVLinkPacket mavLinkPacket) { this.sysid = mavLinkPacket.sysid; this.compid = mavLinkPacket.compid; this.msgid = MAVLINK_MSG_ID_UAVIONIX_ADSB_OUT_CFG; - unpack(mavLinkPacket.payload); + unpack(mavLinkPacket.payload); } - + /** - * Sets the buffer of this message with a string, adds the necessary padding - */ + * Sets the buffer of this message with a string, adds the necessary padding + */ public void setCallsign(String str) { int len = Math.min(str.length(), 9); - for (int i=0; i() { @Override public void onSuccess(final UserAccountState userAccountState) { - showToast("login success! Account state is:" +userAccountState.name()); + showToast("login success! Account state is:" + userAccountState.name()); } @Override @@ -331,26 +327,25 @@ public class ConnectionActivity extends Activity implements View.OnClickListener mBtnTest.setOnClickListener(this); Context appContext = this.getBaseContext(); - String version = "Version: "+getAppVersion(appContext); - Log.v(TAG,""+version); - ((TextView)findViewById(R.id.textView3)).setText(version); + String version = "Version: " + getAppVersion(appContext); + Log.v(TAG, "" + version); + ((TextView) findViewById(R.id.textView3)).setText(version); sharedPreferences = android.preference.PreferenceManager.getDefaultSharedPreferences(this); CustomName = sharedPreferences.getString("pref_app_name", "RosettaDrone 2"); //+"RosettaDrone 2"; - if(CustomName.length() > 0) - ((TextView)findViewById(R.id.textView)).setText(CustomName); + if (CustomName.length() > 0) + ((TextView) findViewById(R.id.textView)).setText(CustomName); - ((TextView)findViewById(R.id.textView2)).setText(getResources().getString(R.string.sdk_version, DJISDKManager.getInstance().getSDKVersion())); + ((TextView) findViewById(R.id.textView2)).setText(getResources().getString(R.string.sdk_version, DJISDKManager.getInstance().getSDKVersion())); } - public static String getAppVersion(Context context){ + public static String getAppVersion(Context context) { PackageManager localPackageManager = context.getPackageManager(); - try{ + try { String str = localPackageManager.getPackageInfo(context.getPackageName(), 0).versionName; return str; - } - catch (PackageManager.NameNotFoundException e){ + } catch (PackageManager.NameNotFoundException e) { Log.v(TAG, "getAppVersion error" + e.getMessage()); e.printStackTrace(); } @@ -363,7 +358,7 @@ public class ConnectionActivity extends Activity implements View.OnClickListener if (RDApplication.getSim() == true) { product = DJISimulatorApplication.getAircraftInstance(); - }else { + } else { product = RDApplication.getProductInstance(); } @@ -433,14 +428,14 @@ public class ConnectionActivity extends Activity implements View.OnClickListener break; case R.id.btn_sim: { - if (RDApplication.getSim() == true){ + if (RDApplication.getSim() == true) { TextView lTextConnectionStatus = (TextView) findViewById(R.id.text_model_simulated); lTextConnectionStatus.setText(""); showToast("noSimulate..."); RDApplication.setSim(false); mTextConnectionStatus.setText(R.string.connection_loose); - }else{ + } else { showToast("Simulate..."); RDApplication.setSim(true); TextView lTextConnectionStatus = (TextView) findViewById(R.id.text_model_simulated); @@ -497,12 +492,12 @@ public class ConnectionActivity extends Activity implements View.OnClickListener if (KeyManager.getInstance() != null) { KeyManager.getInstance().addListener(firmkey, firmVersionListener); } - } else if (RDApplication.getSim() == true){ + } else if (RDApplication.getSim() == true) { Log.v(TAG, "refreshSDK: Sim"); // mBtnOpen.setEnabled(true); mTextProduct.setText(R.string.product_information); - // mTextConnectionStatus.setText(R.string.connection_sim); + // mTextConnectionStatus.setText(R.string.connection_sim); } else { Log.v(TAG, "refreshSDK: False"); mBtnOpen.setEnabled(false); @@ -511,6 +506,7 @@ public class ConnectionActivity extends Activity implements View.OnClickListener mTextConnectionStatus.setText(R.string.connection_loose); } } + @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); diff --git a/app/src/main/java/sq/rogue/rosettadrone/DJISimulatorApplication.java b/app/src/main/java/sq/rogue/rosettadrone/DJISimulatorApplication.java index 690e9c0..c9417ff 100644 --- a/app/src/main/java/sq/rogue/rosettadrone/DJISimulatorApplication.java +++ b/app/src/main/java/sq/rogue/rosettadrone/DJISimulatorApplication.java @@ -3,7 +3,6 @@ package sq.rogue.rosettadrone; import android.app.Application; import android.content.Context; import android.content.Intent; -import android.os.Build; import android.os.Handler; import android.os.Looper; import android.util.Log; @@ -78,7 +77,7 @@ public class DJISimulatorApplication extends Application { @Override public void onRegister(DJIError error) { - if(error == DJISDKError.REGISTRATION_SUCCESS) { + if (error == DJISDKError.REGISTRATION_SUCCESS) { Handler handler = new Handler(Looper.getMainLooper()); handler.post(new Runnable() { @@ -110,6 +109,7 @@ public class DJISimulatorApplication extends Application { Log.d("TAG", "onProductDisconnect"); notifyStatusChange(); } + @Override public void onProductConnect(BaseProduct baseProduct) { Log.d("TAG", String.format("onProductConnect newProduct:%s", baseProduct)); @@ -149,6 +149,7 @@ public class DJISimulatorApplication extends Application { newComponent)); } + @Override public void onInitProcess(DJISDKInitEvent djisdkInitEvent, int i) { diff --git a/app/src/main/java/sq/rogue/rosettadrone/DroneModel.java b/app/src/main/java/sq/rogue/rosettadrone/DroneModel.java index c5d2c86..98fa2cf 100644 --- a/app/src/main/java/sq/rogue/rosettadrone/DroneModel.java +++ b/app/src/main/java/sq/rogue/rosettadrone/DroneModel.java @@ -1,7 +1,5 @@ package sq.rogue.rosettadrone; -import androidx.annotation.NonNull; - import android.app.AlertDialog; import android.os.Handler; import android.os.Looper; @@ -13,7 +11,6 @@ import com.MAVLink.common.msg_altitude; import com.MAVLink.common.msg_attitude; import com.MAVLink.common.msg_autopilot_version; import com.MAVLink.common.msg_battery_status; -import com.MAVLink.common.msg_camera_image_captured; import com.MAVLink.common.msg_command_ack; import com.MAVLink.common.msg_global_position_int; import com.MAVLink.common.msg_gps_raw_int; @@ -53,9 +50,8 @@ import java.util.Arrays; import java.util.Objects; import java.util.Timer; import java.util.TimerTask; -import java.util.concurrent.atomic.AtomicBoolean; -import dji.common.battery.BatteryState; +import androidx.annotation.NonNull; import dji.common.camera.SettingsDefinitions; import dji.common.error.DJIError; import dji.common.flightcontroller.Attitude; @@ -73,7 +69,6 @@ import dji.common.flightcontroller.virtualstick.FlightCoordinateSystem; import dji.common.flightcontroller.virtualstick.RollPitchControlMode; import dji.common.flightcontroller.virtualstick.VerticalControlMode; import dji.common.flightcontroller.virtualstick.YawControlMode; -import dji.common.gimbal.GimbalState; import dji.common.gimbal.Rotation; import dji.common.gimbal.RotationMode; import dji.common.mission.MissionState; @@ -84,10 +79,8 @@ import dji.common.mission.waypoint.Waypoint; import dji.common.mission.waypoint.WaypointMission; import dji.common.mission.waypoint.WaypointMissionState; import dji.common.model.LocationCoordinate2D; -// TENI import dji.common.remotecontroller.ChargeRemaining; import dji.common.product.Model; import dji.common.remotecontroller.HardwareState; -import dji.common.useraccount.UserAccountState; import dji.common.util.CommonCallbacks; import dji.sdk.battery.Battery; import dji.sdk.flightcontroller.FlightController; @@ -96,25 +89,23 @@ import dji.sdk.mission.MissionControl; import dji.sdk.mission.followme.FollowMeMissionOperator; import dji.sdk.mission.waypoint.WaypointMissionOperator; import dji.sdk.products.Aircraft; - import dji.sdk.sdkmanager.DJISDKManager; -// import dji.sdksharedlib.keycatalog.extension.InternalKey; import static com.MAVLink.common.msg_set_position_target_global_int.MAVLINK_MSG_ID_SET_POSITION_TARGET_GLOBAL_INT; -import static com.MAVLink.common.msg_set_position_target_local_ned.MAVLINK_MSG_ID_SET_POSITION_TARGET_LOCAL_NED; import static com.MAVLink.enums.MAV_CMD.MAV_CMD_COMPONENT_ARM_DISARM; import static com.MAVLink.enums.MAV_CMD.MAV_CMD_DO_DIGICAM_CONTROL; +import static com.MAVLink.enums.MAV_CMD.MAV_CMD_DO_SET_PARAMETER; import static com.MAVLink.enums.MAV_CMD.MAV_CMD_DO_SET_SERVO; import static com.MAVLink.enums.MAV_CMD.MAV_CMD_NAV_TAKEOFF; -import static com.MAVLink.enums.MAV_CMD.MAV_CMD_NAV_WAYPOINT; import static com.MAVLink.enums.MAV_CMD.MAV_CMD_VIDEO_START_CAPTURE; import static com.MAVLink.enums.MAV_CMD.MAV_CMD_VIDEO_STOP_CAPTURE; import static com.MAVLink.enums.MAV_COMPONENT.MAV_COMP_ID_AUTOPILOT1; -import static com.MAVLink.enums.MAV_CMD.MAV_CMD_DO_SET_PARAMETER; - import static sq.rogue.rosettadrone.util.getTimestampMicroseconds; import static sq.rogue.rosettadrone.util.safeSleep; +// TENI import dji.common.remotecontroller.ChargeRemaining; +// import dji.sdksharedlib.keycatalog.extension.InternalKey; + public class DroneModel implements CommonCallbacks.CompletionCallback { private static final int NOT_USING_GCS_COMMANDED_MODE = -1; @@ -131,40 +122,40 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { private int mSystemId = 1; private int mGCSCommandedMode; - private int mThrottleSetting=0; - private int mLeftStickVertical=0; - private int mLeftStickHorisontal=0; - private int mRightStickVertical=0; - private int mRightStickHorisontal=0; - private boolean mC1=false; - private boolean mC2=false; - private boolean mC3=false; + private int mThrottleSetting = 0; + private int mLeftStickVertical = 0; + private int mLeftStickHorisontal = 0; + private int mRightStickVertical = 0; + private int mRightStickHorisontal = 0; + private boolean mC1 = false; + private boolean mC2 = false; + private boolean mC3 = false; - private int mCFullChargeCapacity_mAh=0; - private int mCChargeRemaining_mAh=0; - private int mCVoltage_mV=0; - private int mCVoltage_pr=0; - private int mCCurrent_mA=0; - private float mCBatteryTemp_C=0; + private int mCFullChargeCapacity_mAh = 0; + private int mCChargeRemaining_mAh = 0; + private int mCVoltage_mV = 0; + private int mCVoltage_pr = 0; + private int mCCurrent_mA = 0; + private float mCBatteryTemp_C = 0; private int mlastState = 100; - private int mFullChargeCapacity_mAh=0; - private int mChargeRemaining_mAh=0; - private int mVoltage_mV=0; - private int mVoltage_pr=0; - private int mCurrent_mA=0; + private int mFullChargeCapacity_mAh = 0; + private int mChargeRemaining_mAh = 0; + private int mVoltage_mV = 0; + private int mVoltage_pr = 0; + private int mCurrent_mA = 0; private int[] mCellVoltages = new int[10]; private int mDownlinkQuality = 0; private int mUplinkQuality = 0; - private int mControllerVoltage_pr=0; + private int mControllerVoltage_pr = 0; - private float mPitch=0; - private float mRoll=0; - private float mYaw=0; - private float mThrottle=0; - private double m_Latitude=0; - private double m_Longitude=0; - public float m_alt=0; + private float mPitch = 0; + private float mRoll = 0; + private float mYaw = 0; + private float mThrottle = 0; + private double m_Latitude = 0; + private double m_Longitude = 0; + public float m_alt = 0; private double m_Destination_Lat = 0; private double m_Destination_Lon = 0; @@ -181,18 +172,20 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { private FlightMode lastMode = FlightMode.ATTI_HOVER; private HardwareState.FlightModeSwitch rcmode = HardwareState.FlightModeSwitch.POSITION_ONE; -// Mavic + // Mavic private static HardwareState.FlightModeSwitch avtivemode = HardwareState.FlightModeSwitch.POSITION_ONE; // Change this to decide what position the mode switch should be inn. - private SendVelocityDataTask mSendVirtualStickDataTask = null;; + private SendVelocityDataTask mSendVirtualStickDataTask = null; + ; private Timer mSendVirtualStickDataTimer = null; - private MoveTo mMoveToDataTask = null;; + private MoveTo mMoveToDataTask = null; + ; private Timer mMoveToDataTimer = null; private Rotation m_ServoSet; - private float m_ServoPos_pitch =0; - private float m_ServoPos_yaw =0; + private float m_ServoPos_pitch = 0; + private float m_ServoPos_yaw = 0; private MiniPID miniPIDSide; private MiniPID miniPIDFwd; @@ -217,18 +210,18 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { initFlightController(sim); } - public float get_battery_status(){ - if(mCFullChargeCapacity_mAh > 0) { + public float get_battery_status() { + if (mCFullChargeCapacity_mAh > 0) { return (mCVoltage_pr); //mCChargeRemaining_mAh * 100 / mCFullChargeCapacity_mAh); } return 0; } - public float get_drone_battery_prosentage(){ + public float get_drone_battery_prosentage() { return mCVoltage_pr; } - public float get_controller_battery_prosentage(){ + public float get_controller_battery_prosentage() { return mControllerVoltage_pr; } @@ -247,7 +240,7 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { return; } else { m_model = aircraft.getModel(); - if(m_model.equals("INSPIRE_1") || m_model.equals("INSPIRE_1_PRO") || m_model.equals("INSPIRE_1_RAW")){ + if (m_model.equals("INSPIRE_1") || m_model.equals("INSPIRE_1_PRO") || m_model.equals("INSPIRE_1_RAW")) { avtivemode = HardwareState.FlightModeSwitch.POSITION_THREE; } @@ -257,9 +250,9 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { mFlightController.setYawControlMode(YawControlMode.ANGULAR_VELOCITY); mFlightController.setVerticalControlMode(VerticalControlMode.VELOCITY); mFlightController.setRollPitchCoordinateSystem(FlightCoordinateSystem.BODY); - mFlightController.setFlightOrientationMode(FlightOrientationMode.COURSE_LOCK,null); + mFlightController.setFlightOrientationMode(FlightOrientationMode.COURSE_LOCK, null); - if(sim) { + if (sim) { parent.logMessageDJI("Starting Simulator..."); mFlightController.getSimulator().setStateCallback(stateData -> new Handler(Looper.getMainLooper()).post(() -> { /* @@ -282,7 +275,7 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { if (mFlightController != null) { parent.logMessageDJI("Target found..."); - if(sim) { + if (sim) { mFlightController.getSimulator() .start(InitializationData.createInstance(new LocationCoordinate2D(60.4094, 10.4911), 10, 10), djiError -> { @@ -461,12 +454,11 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { while (getWaypointMissionOperator().getCurrentState() == WaypointMissionState.UPLOADING) { safeSleep(200); } - if (getWaypointMissionOperator().getCurrentState() == WaypointMissionState.READY_TO_EXECUTE){ + if (getWaypointMissionOperator().getCurrentState() == WaypointMissionState.READY_TO_EXECUTE) { parent.logMessageDJI("Mission uploaded and ready to execute!"); mission_loaded = MAV_MISSION_RESULT.MAV_MISSION_ACCEPTED; send_mission_ack(mission_loaded); - } - else { + } else { parent.logMessageDJI("Error uploading waypoint mission to drone."); mission_loaded = MAV_MISSION_RESULT.MAV_MISSION_ERROR; send_mission_ack(mission_loaded); @@ -506,9 +498,9 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { }); parent.runOnUiThread(() -> { - // Uri notification = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION); - // Ringtone r = RingtoneManager.getRingtone(getApplicationContext(), notification); - // r.play(); + // Uri notification = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION); + // Ringtone r = RingtoneManager.getRingtone(getApplicationContext(), notification); + // r.play(); alertDialog2.show(); }); @@ -528,7 +520,7 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { **************************************************/ this.djiAircraft.getRemoteController().setHardwareStateCallback(new HardwareState.HardwareStateCallback() { - // boolean lastState = false; + // boolean lastState = false; @Override public void onUpdate(@NonNull HardwareState rcHardwareState) { @@ -536,10 +528,10 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { mThrottleSetting = (Objects.requireNonNull(rcHardwareState.getLeftStick()).getVerticalPosition() + 660) / 1320; // Mavlink: 1000 to 2000 with 1500 = 1.5ms as center... - mLeftStickVertical = (int)(rcHardwareState.getLeftStick().getVerticalPosition() * 0.8 ) + 1500; - mLeftStickHorisontal = (int)(rcHardwareState.getLeftStick().getHorizontalPosition() * 0.8 ) + 1500; - mRightStickVertical = (int)(rcHardwareState.getRightStick().getVerticalPosition() * 0.8 ) + 1500; - mRightStickHorisontal = (int)(rcHardwareState.getRightStick().getHorizontalPosition() * 0.8 ) + 1500; + mLeftStickVertical = (int) (rcHardwareState.getLeftStick().getVerticalPosition() * 0.8) + 1500; + mLeftStickHorisontal = (int) (rcHardwareState.getLeftStick().getHorizontalPosition() * 0.8) + 1500; + mRightStickVertical = (int) (rcHardwareState.getRightStick().getVerticalPosition() * 0.8) + 1500; + mRightStickHorisontal = (int) (rcHardwareState.getRightStick().getHorizontalPosition() * 0.8) + 1500; mC1 = Objects.requireNonNull(rcHardwareState.getC1Button()).isClicked(); mC2 = Objects.requireNonNull(rcHardwareState.getC2Button()).isClicked(); mC3 = Objects.requireNonNull(rcHardwareState.getC3Button()).isClicked(); @@ -563,19 +555,20 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { this.djiAircraft.getRemoteController().setChargeRemainingCallback(new dji.common.remotecontroller.BatteryState.Callback() { private int lastState = 100; + @Override public void onUpdate(dji.common.remotecontroller.BatteryState batteryState) { mControllerVoltage_pr = (batteryState.getRemainingChargeInPercent()); - if(mControllerVoltage_pr > 90) lastState = 100; - if(mControllerVoltage_pr < 20 && lastState == 100){ + if (mControllerVoltage_pr > 90) lastState = 100; + if (mControllerVoltage_pr < 20 && lastState == 100) { lastState = 20; SetMesasageBox("Controller Battery Warning 20% !!!!!"); } - if(mControllerVoltage_pr < 10 && lastState == 20){ + if (mControllerVoltage_pr < 10 && lastState == 20) { lastState = 10; SetMesasageBox("Controller Battery Warning 10% !!!!!"); } - if(mControllerVoltage_pr < 5 && lastState == 10){ + if (mControllerVoltage_pr < 5 && lastState == 10) { lastState = 5; SetMesasageBox("Controller Battery Warning 5% !!!!!"); } @@ -597,7 +590,7 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { mCBatteryTemp_C = batteryState.getTemperature(); mCVoltage_pr = batteryState.getChargeRemainingInPercent(); - if(mCVoltage_pr > 0) { + if (mCVoltage_pr > 0) { // Log.d(TAG, "Voltage %: " + mCVoltage_pr); // Log.d(TAG, "mlastState %: " + mlastState); @@ -615,7 +608,7 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { SetMesasageBox("Drone Battery Warning 5% !!!!!"); } } - // Log.d(TAG, "Voltage %: " + mCVoltage_pr); + // Log.d(TAG, "Voltage %: " + mCVoltage_pr); }); this.djiAircraft.getBattery().getCellVoltages(new CellVoltageCompletionCallback()); } else { @@ -624,13 +617,13 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { } Battery.setAggregationStateCallback(aggregationState -> { - // Log.d(TAG, "Aggregation State callback"); + // Log.d(TAG, "Aggregation State callback"); mFullChargeCapacity_mAh = aggregationState.getFullChargeCapacity(); mChargeRemaining_mAh = aggregationState.getChargeRemaining(); mVoltage_mV = aggregationState.getVoltage(); mCurrent_mA = aggregationState.getCurrent(); mVoltage_pr = aggregationState.getChargeRemainingInPercent(); - // Log.d(TAG, "Aggregated voltage: " + String.valueOf(aggregationState.getVoltage())); + // Log.d(TAG, "Aggregated voltage: " + String.valueOf(aggregationState.getVoltage())); }); /************************************************** @@ -750,7 +743,7 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { }); } - private void sendMessage(MAVLinkMessage msg) { + public void sendMessage(MAVLinkMessage msg) { if (socket == null) return; @@ -964,13 +957,14 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { sendMessage(msg); } - public void setAIfunction(int ai){ + public void setAIfunction(int ai) { mAIfunction_activation = ai; } + // Does not work, use RC ch 8... void send_AI_Function(int num) { msg_statustext msg = new msg_statustext(); - String data = "Mgs: RosettaDrone: AI Fuction "+num+" True"; + String data = "Mgs: RosettaDrone: AI Fuction " + num + " True"; byte[] txt = data.getBytes(); msg.text = txt; sendMessage(msg); @@ -1020,10 +1014,12 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { LocationCoordinate3D coord = djiAircraft.getFlightController().getState().getAircraftLocation(); return coord.getLatitude(); } + public double get_current_lon() { LocationCoordinate3D coord = djiAircraft.getFlightController().getState().getAircraftLocation(); return coord.getLongitude(); } + public float get_current_alt() { LocationCoordinate3D coord = djiAircraft.getFlightController().getState().getAircraftLocation(); return coord.getAltitude(); @@ -1064,13 +1060,13 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { private void send_sys_status() { msg_sys_status msg = new msg_sys_status(); - // Log.d(TAG, "Full charge capacity: " + String.valueOf(mCFullChargeCapacity_mAh)); - // Log.d(TAG, "Charge remaining: " + String.valueOf(mCChargeRemaining_mAh)); - // Log.d(TAG, "Full charge capacity: " + String.valueOf(mCFullChargeCapacity_mAh)); + // Log.d(TAG, "Full charge capacity: " + String.valueOf(mCFullChargeCapacity_mAh)); + // Log.d(TAG, "Charge remaining: " + String.valueOf(mCChargeRemaining_mAh)); + // Log.d(TAG, "Full charge capacity: " + String.valueOf(mCFullChargeCapacity_mAh)); if (mCFullChargeCapacity_mAh > 0) { msg.battery_remaining = (byte) ((float) mCChargeRemaining_mAh / (float) mCFullChargeCapacity_mAh * 100.0); - // Log.d(TAG, "calc'ed bat remain: " + String.valueOf(msg.battery_remaining)); + // Log.d(TAG, "calc'ed bat remain: " + String.valueOf(msg.battery_remaining)); } else { Log.d(TAG, "mCFullChargeCapacity_mAh == 0..."); msg.battery_remaining = 100; // Prevent divide by zero @@ -1099,23 +1095,23 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { msg.chan2_raw = mLeftStickHorisontal; msg.chan3_raw = mRightStickVertical; msg.chan4_raw = mRightStickHorisontal; - msg.chan5_raw = mC1 ?1000:2000; - msg.chan6_raw = mC2 ?1000:2000; - msg.chan7_raw = mC3 ?1000:2000; + msg.chan5_raw = mC1 ? 1000 : 2000; + msg.chan6_raw = mC2 ? 1000 : 2000; + msg.chan7_raw = mC3 ? 1000 : 2000; - // Cancel all AI modes if stick is moved... - if ((mLeftStickVertical > 1550 || mLeftStickVertical < 1450) || - (mLeftStickHorisontal > 1550 || mLeftStickHorisontal < 1450) || - (mRightStickVertical > 1550 || mRightStickVertical < 1450) || - (mRightStickHorisontal > 1550 || mRightStickHorisontal < 1450)) { - if(mAIfunction_activation != 0) { + // Cancel all AI modes if stick is moved... + if ((mLeftStickVertical > 1550 || mLeftStickVertical < 1450) || + (mLeftStickHorisontal > 1550 || mLeftStickHorisontal < 1450) || + (mRightStickVertical > 1550 || mRightStickVertical < 1450) || + (mRightStickHorisontal > 1550 || mRightStickHorisontal < 1450)) { + if (mAIfunction_activation != 0) { parent.logMessageDJI("AI Mode Canceled..."); mAIfunction_activation = 0; } mAutonomy = false; } - msg.chan8_raw = (mAIfunction_activation*100)+1000; + msg.chan8_raw = (mAIfunction_activation * 100) + 1000; msg.chancount = 8; sendMessage(msg); } @@ -1132,7 +1128,7 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { float mBatteryTemp_C = 0; msg.temperature = (short) (mBatteryTemp_C * 100); msg.current_battery = (short) (mCurrent_mA * 10); - // Log.d(TAG, "temp: " + String.valueOf(mBatteryTemp_C)); + // Log.d(TAG, "temp: " + String.valueOf(mBatteryTemp_C)); // Log.d(TAG, "send_battery_status() complete"); // TODO cell voltages sendMessage(msg); @@ -1190,6 +1186,10 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { sendMessage(msg); } + void set_home_position(double lat, double lon) { + djiAircraft.getFlightController().getState().setHomeLocation(new LocationCoordinate2D(lat, lon)); + } + public void send_statustext(String text, int severity) { msg_statustext msg = new msg_statustext(); msg.text = text.getBytes(); @@ -1378,7 +1378,6 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { } - void send_mission_count() { msg_mission_count msg = new msg_mission_count(); msg.mission_type = MAV_MISSION_TYPE.MAV_MISSION_TYPE_MISSION; @@ -1412,9 +1411,9 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { // Send mission accepted back to Mavlink... void send_mission_ack(int status) { - parent.logMessageDJI("Mavlink: "+status); + parent.logMessageDJI("Mavlink: " + status); msg_mission_ack msg = new msg_mission_ack(); - msg.type = (short)status; + msg.type = (short) status; msg.mission_type = MAV_MISSION_TYPE.MAV_MISSION_TYPE_MISSION; sendMessage(msg); } @@ -1438,7 +1437,7 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { void startWaypointMission() { mAutonomy = false; parent.logMessageDJI("start WaypointMission()"); - + if (getWaypointMissionOperator() == null) { parent.logMessageDJI("start WaypointMission() - WaypointMissionOperator null"); return; @@ -1524,8 +1523,9 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { } } - void do_takeoff(double alt) { + void do_takeoff(float alt) { mAutonomy = false; + if (mSafetyEnabled) { parent.logMessageDJI(parent.getResources().getString(R.string.safety_launch)); send_command_ack(MAV_CMD_NAV_TAKEOFF, MAV_RESULT.MAV_RESULT_DENIED); @@ -1533,21 +1533,12 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { } // Only allow takeoff in P mode... - if( rcmode == avtivemode) { - parent.logMessageDJI(":rcmode != avtivemode "+rcmode+" "+avtivemode ); - Log.i(TAG, ":rcmode != avtivemode "+rcmode+" "+avtivemode ); + if (rcmode == avtivemode) { + parent.logMessageDJI(":rcmode != avtivemode " + rcmode + " " + avtivemode); + Log.i(TAG, ":rcmode != avtivemode " + rcmode + " " + avtivemode); send_command_ack(MAV_CMD_NAV_TAKEOFF, MAV_RESULT.MAV_RESULT_DENIED); return; } - - FlightControllerState coord = djiAircraft.getFlightController().getState(); - - Log.d(TAG, "Init Timeline..."); - TimeLine.TimeLinetakeOff(coord.getAircraftLocation().getLatitude(), coord.getAircraftLocation().getLongitude(),(int)Math.ceil(alt),0); - Log.d(TAG, "Start Timeline..."); - TimeLine.startTimeline(); - Log.d(TAG, "Timeline started..."); - /* if (getWaypointMissionOperator().getCurrentState() == WaypointMissionState.READY_TO_EXECUTE) { startWaypointMission(); @@ -1557,18 +1548,73 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { djiAircraft.getFlightController().startTakeoff(djiError -> { if (djiError != null) { parent.logMessageDJI("Error: " + djiError.toString()); - // send_command_ack(MAV_CMD_NAV_TAKEOFF, MAV_RESULT.MAV_RESULT_FAILED); + // send_command_ack(MAV_CMD_NAV_TAKEOFF, MAV_RESULT.MAV_RESULT_FAILED); mAirBorn = 1; } else { parent.logMessageDJI("Takeoff successful!\n"); - // send_command_ack(MAV_CMD_NAV_TAKEOFF, MAV_RESULT.MAV_RESULT_ACCEPTED); + // send_command_ack(MAV_CMD_NAV_TAKEOFF, MAV_RESULT.MAV_RESULT_ACCEPTED); mAirBorn = 2; } mGCSCommandedMode = NOT_USING_GCS_COMMANDED_MODE; }); } + // Wait for command to be executed... + Log.d(TAG,"Wait for takeoff..."); + while( mAirBorn == 0) { + safeSleep(250); + } + + // Check if ok or failed... + if(mAirBorn == 1) { + Log.d(TAG,"Takeoff failed..."); + send_command_ack(MAV_CMD_NAV_TAKEOFF, MAV_RESULT.MAV_RESULT_FAILED); + } + else{ + send_command_ack(MAV_CMD_NAV_TAKEOFF, MAV_RESULT.MAV_RESULT_IN_PROGRESS); + + int timeout = 0; + + // If we took off, wait for command co complete... + Log.d(TAG,"Wait for first altitude..."); + while (m_alt < 1000.0 || timeout > (20*(1/0.250))) { + timeout+= 1; + safeSleep(250); + } + + Log.d(TAG,"Takeoff success..."); + safeSleep(500); + + timeout = 0; + // If we are airborne, or was airborne from the start... + if (m_alt >= 800) { + float desired_alt = alt - m_alt; + Log.d(TAG, "Climb out...from: "+m_alt+" to: "+desired_alt+" set: "+alt); + // Climb out to 99% of requested altitude, however 100% is set, just to avoid deadlock... + while (m_alt < desired_alt || timeout > (30*(1/0.250))){ + do_set_motion_relative(MAV_CMD_NAV_TAKEOFF, 0, 0, (alt - m_alt) / (float) 1000.0, 0, 0, 0, 0, 0, 0b00011111111000); + timeout+= 1; + safeSleep(250); + } + Log.d(TAG, "Climb out completed..."+m_alt); + }else{ + Log.d(TAG, "Climb out failed..."); + } + } + */ + if (getWaypointMissionOperator().getCurrentState() == WaypointMissionState.READY_TO_EXECUTE) { + startWaypointMission(); + send_command_ack(MAV_CMD_NAV_TAKEOFF, MAV_RESULT.MAV_RESULT_ACCEPTED); + } else { + FlightControllerState coord = djiAircraft.getFlightController().getState(); + + Log.d(TAG, "Init Timeline..."); + TimeLine.TimeLinetakeOff(coord.getAircraftLocation().getLatitude(), coord.getAircraftLocation().getLongitude(), alt, 0); + Log.d(TAG, "Start Timeline..."); + TimeLine.startTimeline(); + Log.d(TAG, "Timeline started..."); + } } void do_land() { @@ -1600,18 +1646,17 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { * Motion implementation * ********************************************/ - void do_set_Gimbal(float channel, float value) - { + void do_set_Gimbal(float channel, float value) { Rotation.Builder builder = new Rotation.Builder().mode(RotationMode.ABSOLUTE_ANGLE).time(2); - float param = (value-(float)1500.0)/(float)5.5; - if ((int)channel == 9) { + float param = (value - (float) 1500.0) / (float) 5.5; + if ((int) channel == 9) { m_ServoPos_pitch = param; builder.pitch(m_ServoPos_pitch); - } else if ((int)channel == 8) { + } else if ((int) channel == 8) { builder.mode(RotationMode.RELATIVE_ANGLE); builder.yaw(-m_ServoPos_yaw + param); m_ServoPos_yaw = param; - }else{ + } else { send_command_ack(MAV_CMD_DO_SET_SERVO, MAV_RESULT.MAV_RESULT_UNSUPPORTED); return; } @@ -1626,7 +1671,7 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { if (djiError != null) parent.logMessageDJI("Error: " + djiError.toString()); - Log.e(TAG, "Gimbal Pos: "+m_ServoSet.getPitch()+" : "+m_ServoSet.getYaw()); + Log.e(TAG, "Gimbal Pos: " + m_ServoSet.getPitch() + " : " + m_ServoSet.getYaw()); send_command_ack(MAV_CMD_DO_SET_SERVO, MAV_RESULT.MAV_RESULT_ACCEPTED); }); } @@ -1634,13 +1679,13 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { // -------------------------------------------------------------------------------- // We want to move to a lat,lon,alt position, this has no support by DJI... public void do_set_motion_relative(int command, double forward, double right, float up, float head, float vx, float vy, float vz, float yaw_rate, int mask) { - // Log.i(TAG, "do_set_motion_relative"); + // Log.i(TAG, "do_set_motion_relative"); // Find the global lat/lon from the local reference fram (the drone is origo)... double[] pos = get_location_metres(forward, right, up); m_Destination_Lat = pos[0]; m_Destination_Lon = pos[1]; - m_Destination_Alt = (float)pos[2]; + m_Destination_Alt = (float) pos[2]; m_Destination_Yaw = head; m_Destination_Yaw_rate = yaw_rate; m_Destination_Set_vx = vx; @@ -1653,17 +1698,23 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { FlightControllerState coord = djiAircraft.getFlightController().getState(); // Find the heading difference compared to bearing... return 0-360 deg. - m_Destination_brng = getBearingBetweenWaypoints(m_Destination_Lat, m_Destination_Lon, coord.getAircraftLocation().getLatitude(), coord.getAircraftLocation().getLongitude())-180; - if ( m_Destination_brng < 0) m_Destination_brng = m_Destination_brng+360; + m_Destination_brng = getBearingBetweenWaypoints(m_Destination_Lat, m_Destination_Lon, coord.getAircraftLocation().getLatitude(), coord.getAircraftLocation().getLongitude()) - 180; + if (m_Destination_brng < 0) m_Destination_brng = m_Destination_brng + 360; // The direct distance to the destination... return distance in meters... - m_Destination_hypotenuse = getRangeBetweenWaypoints_m( m_Destination_Lat, m_Destination_Lon, 0, coord.getAircraftLocation().getLatitude(), coord.getAircraftLocation().getLongitude(), 0); + m_Destination_hypotenuse = getRangeBetweenWaypoints_m(m_Destination_Lat, m_Destination_Lon, 0, coord.getAircraftLocation().getLatitude(), coord.getAircraftLocation().getLongitude(), 0); do_start_absolute_motion(); } + // -------------------------------------------------------------------------------- + public void goto_position(double Lat, double Lon, float alt, float head) { + TimeLine.TimeLineGoTo(Lat, Lon, alt, (float) 2.0, head); + TimeLine.startTimeline(); + } + // We want to move to a lat,lon,alt position, this has no support by DJI... public void do_set_motion_absolute(double Lat, double Lon, float alt, float head, float vx, float vy, float vz, float yaw_rate, int mask) { - // Log.i(TAG, "do_set_motion_absolute"); + // Log.i(TAG, "do_set_motion_absolute"); // Set our new destination... m_Destination_Lat = Lat; @@ -1684,22 +1735,22 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { double local_lon = coord.getAircraftLocation().getLongitude(); // Find the bearing to wp... return 0-360 deg. - m_Destination_brng = getBearingBetweenWaypoints(m_Destination_Lat, m_Destination_Lon, local_lat, local_lon)-180; - if ( m_Destination_brng < 0) m_Destination_brng = m_Destination_brng+360; + m_Destination_brng = getBearingBetweenWaypoints(m_Destination_Lat, m_Destination_Lon, local_lat, local_lon) - 180; + if (m_Destination_brng < 0) m_Destination_brng = m_Destination_brng + 360; // The direct distance to the wp... return distance in meters... - m_Destination_hypotenuse = getRangeBetweenWaypoints_m( m_Destination_Lat, m_Destination_Lon, 0, local_lat, local_lon, 0); - Log.i(TAG, "m_Destination_hypotenuse: "+m_Destination_hypotenuse+" m_Destination_brng: "+m_Destination_brng ); + m_Destination_hypotenuse = getRangeBetweenWaypoints_m(m_Destination_Lat, m_Destination_Lon, 0, local_lat, local_lon, 0); + Log.i(TAG, "m_Destination_hypotenuse: " + m_Destination_hypotenuse + " m_Destination_brng: " + m_Destination_brng); do_start_absolute_motion(); } - private void do_start_absolute_motion(){ - // Log.i(TAG, "do_start_absolute_motion"); + private void do_start_absolute_motion() { + // Log.i(TAG, "do_start_absolute_motion"); // Start a task to do the job... if not already running... - if( mMoveToDataTimer == null) { - parent.logMessageDJI("Starting new thread!" ); + if (mMoveToDataTimer == null) { + parent.logMessageDJI("Starting new thread!"); // miniPIDFwd.reset(); // miniPIDSide.reset(); @@ -1711,8 +1762,7 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { mMoveToDataTimer = new Timer(); mMoveToDataTimer.schedule(mMoveToDataTask, 100, 190); mAutonomy = true; - } - else{ + } else { mMoveToDataTask.detection = 0; } } @@ -1722,7 +1772,7 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { @Override public void run() { - // Log.i(TAG, "TimerTask"); + // Log.i(TAG, "TimerTask"); FlightControllerState coord = djiAircraft.getFlightController().getState(); double local_lat = coord.getAircraftLocation().getLatitude(); @@ -1738,15 +1788,15 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { // If yaw is masked then do not change yaw... double yawerror; - if ( (m_Destination_Mask & 0b0000010000000000) > 0) yawerror = 0; - // Make the error +-180 deg. error + is we need to turn more right...mAutonomy - else yawerror = rotation(m_Destination_Yaw*(180/Math.PI), yaw ); + if ((m_Destination_Mask & 0b0000010000000000) > 0) yawerror = 0; + // Make the error +-180 deg. error + is we need to turn more right...mAutonomy + else yawerror = rotation(m_Destination_Yaw * (180 / Math.PI), yaw); // Do we move og not... - if ( (m_Destination_Mask & 0b0000000000111111) == 0x3F) dist = 0; + if ((m_Destination_Mask & 0b0000000000111111) == 0x3F) dist = 0; // If we are there... - if ( (dist < 0.2 && Math.abs(yawerror) < 1.25) || mAutonomy == false) { + if ((dist < 0.2 && Math.abs(yawerror) < 1.25) || mAutonomy == false) { // If we got 5 (1 sec) consecutive hits at the right spot.... if (++detection > 7 || mAutonomy == false) { mMoveToDataTimer.cancel(); @@ -1767,25 +1817,25 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { // Find the bearing... return 0-360 deg. double brng = getBearingBetweenWaypoints(m_Destination_Lat, m_Destination_Lon, local_lat, local_lon); // The direct distance to the destination... return distance in meters... - double hypotenuse = getRangeBetweenWaypoints_m( m_Destination_Lat, m_Destination_Lon, 0, local_lat, local_lon, 0); - double idealPos[] = get_location_intermediet(m_Destination_Lat, m_Destination_Lon, hypotenuse,m_Destination_brng); + double hypotenuse = getRangeBetweenWaypoints_m(m_Destination_Lat, m_Destination_Lon, 0, local_lat, local_lon, 0); + double idealPos[] = get_location_intermediet(m_Destination_Lat, m_Destination_Lon, hypotenuse, m_Destination_brng); // At these two positions is at the same distance from target, the error must be the sideways error.... - double offset = getRangeBetweenWaypoints_m(idealPos[0], idealPos[1], 0,local_lat, local_lon, 0); - double pol = getBearingBetweenWaypoints(idealPos[0], idealPos[1], local_lat, local_lon); + double offset = getRangeBetweenWaypoints_m(idealPos[0], idealPos[1], 0, local_lat, local_lon, 0); + double pol = getBearingBetweenWaypoints(idealPos[0], idealPos[1], local_lat, local_lon); double diff = rotation(brng, pol); - if(diff> 0) { - offset*=-1; + if (diff > 0) { + offset *= -1; } - Log.i(TAG, "diff: "+diff+"brng: "+brng+" hypotenuse: "+hypotenuse +" offset: "+offset+" pol: "+pol); + Log.i(TAG, "diff: " + diff + "brng: " + brng + " hypotenuse: " + hypotenuse + " offset: " + offset + " pol: " + pol); // Drone heading - Waypoint bearing... to 0-360 deg... - double direction = rotation(brng, yaw ); + double direction = rotation(brng, yaw); // Find the X and Y distance from the hypotenuse and the direction... double right_dist = offset; //Math.max(offset,20); // bearing_error; //Math.sin(Math.toRadians(direction)) * hypotenuse + Math.cos(Math.toRadians(direction)) * bearing_error ; - double fw_dist = hypotenuse; //Math.max(hypotenuse,20); // Math.cos(Math.toRadians(direction)) * hypotenuse + Math.sin(Math.toRadians(direction)) * bearing_error; - Log.i(TAG, "direction: "+direction); + double fw_dist = hypotenuse; //Math.max(hypotenuse,20); // Math.cos(Math.toRadians(direction)) * hypotenuse + Math.sin(Math.toRadians(direction)) * bearing_error; + Log.i(TAG, "direction: " + direction); //------------------------------------------------ // Make a very simple P controller... @@ -1794,82 +1844,90 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { double speed = 0; //------------------------------------------------ - if ( (m_Destination_Mask & 0b0000000000001000) == 0) speed = m_Destination_Set_vx; + if ((m_Destination_Mask & 0b0000000000001000) == 0) speed = m_Destination_Set_vx; else speed = maxspeed; miniPIDFwd.setOutputLimits(speed); - double fwmotion = miniPIDFwd.getOutput(-fw_dist,0); + double fwmotion = miniPIDFwd.getOutput(-fw_dist, 0); //------------------------------------------------ - if ( (m_Destination_Mask & 0b0000000000010000) == 0) speed = m_Destination_Set_vy; + if ((m_Destination_Mask & 0b0000000000010000) == 0) speed = m_Destination_Set_vy; else speed = maxspeed; miniPIDSide.setOutputLimits(speed); - double rightmotion = miniPIDSide.getOutput(-right_dist,0); + double rightmotion = miniPIDSide.getOutput(-right_dist, 0); //------------------------------------------------ - if ( (m_Destination_Mask & 0b0000000000100000) == 0) speed = m_Destination_Set_vz; + if ((m_Destination_Mask & 0b0000000000100000) == 0) speed = m_Destination_Set_vz; else speed = maxspeed; - double upmotion = (m_Destination_Alt-coord.getAircraftLocation().getAltitude())*motion_p; + double upmotion = (m_Destination_Alt - coord.getAircraftLocation().getAltitude()) * motion_p; if (upmotion > speed) upmotion = speed; if (upmotion < -speed) upmotion = -speed; //------------------------------------------------ - if ( (m_Destination_Mask & 0b0000100000000000) == 0) speed = m_Destination_Yaw_rate; - else speed = maxspeed*15; - double clockmotion = yawerror*motion_p; + if ((m_Destination_Mask & 0b0000100000000000) == 0) speed = m_Destination_Yaw_rate; + else speed = maxspeed * 15; + double clockmotion = yawerror * motion_p; if (clockmotion > speed) clockmotion = speed; if (clockmotion < -speed) clockmotion = -speed; //------------------------------------------------ - if ( (m_Destination_Mask & 0b0000000000111111) == 0x3F) { - // parent.logMessageDJI("To Yaw..."); + if ((m_Destination_Mask & 0b0000000000111111) == 0x3F) { + // parent.logMessageDJI("To Yaw..."); do_set_motion_velocity((float) 0, (float) 0, (float) 0, (float) clockmotion, 0b1111011111111111); - } - else { + } else { - Log.i(TAG, "fwmotion: "+fwmotion+" rightmotion: "+rightmotion); + Log.i(TAG, "fwmotion: " + fwmotion + " rightmotion: " + rightmotion); double fmove = Math.cos(Math.toRadians(direction)) * fwmotion - Math.sin(Math.toRadians(direction)) * rightmotion; - double rmove = Math.sin(Math.toRadians(direction)) * fwmotion + Math.cos(Math.toRadians(direction)) * rightmotion ; - Log.i(TAG, "rmove: "+rmove+" fmove: "+fmove); + double rmove = Math.sin(Math.toRadians(direction)) * fwmotion + Math.cos(Math.toRadians(direction)) * rightmotion; + Log.i(TAG, "rmove: " + rmove + " fmove: " + fmove); do_set_motion_velocity((float) fmove, (float) rmove, (float) upmotion, (float) clockmotion, 0b1111011111000111); // do_set_motion_velocity((float) fwmotion, (float) rightmotion, (float) upmotion, (float) clockmotion, 0b1111011111000111); } } } + // -------------------------------------------------------------------------------- void do_set_motion_velocity_NED(float dNorth, float dEast, float D, float yaw, int mask) { // If we use yaw rate... - // parent.logMessageDJI(":Velocity NED" ); + // parent.logMessageDJI(":Velocity NED" ); FlightControllerState coord = djiAircraft.getFlightController().getState(); double ro = Math.toRadians(coord.getAttitude().yaw); - double dForward = dNorth * Math.cos(ro) + dEast*Math.sin(ro); - double dRight = -dNorth * Math.sin(ro) + dEast*Math.cos(ro); - do_set_motion_velocity((float)dForward, (float)dRight, D, yaw, mask); + double dForward = dNorth * Math.cos(ro) + dEast * Math.sin(ro); + double dRight = -dNorth * Math.sin(ro) + dEast * Math.cos(ro); + do_set_motion_velocity((float) dForward, (float) dRight, D, yaw, mask); } // -------------------------------------------------------------------------------- void do_set_motion_velocity(float x, float y, float z, float yaw, int mask) { - // Log.i(TAG, "do_set_motion_velocity"); + // Log.i(TAG, "do_set_motion_velocity"); // If we use yaw rate... - if((mask & 0b0000100000000000) == 0){ mYaw = yaw; } - if((mask & 0b0000000000001000) == 0){ mPitch = y; } - if((mask & 0b0000000000010000) == 0){ mRoll = x; } - if((mask & 0b0000000000100000) == 0){ mThrottle = z;} + if ((mask & 0b0000100000000000) == 0) { + mYaw = yaw; + } + if ((mask & 0b0000000000001000) == 0) { + mPitch = y; + } + if ((mask & 0b0000000000010000) == 0) { + mRoll = x; + } + if ((mask & 0b0000000000100000) == 0) { + mThrottle = z; + } // Only allow velocity movement in P mode... - if( rcmode == avtivemode) { - parent.logMessageDJI(":rcmode != avtivemode "+rcmode+" "+avtivemode ); - Log.i(TAG, ":rcmode != avtivemode "+rcmode+" "+avtivemode ); + if (rcmode == avtivemode) { + parent.logMessageDJI(":rcmode != avtivemode " + rcmode + " " + avtivemode); + Log.i(TAG, ":rcmode != avtivemode " + rcmode + " " + avtivemode); return; } mFlightController.getVirtualStickModeEnabled(new CommonCallbacks.CompletionCallbackWith() { @Override public void onSuccess(Boolean aBoolean) { - if( aBoolean == false){ + if (aBoolean == false) { // After a manual mode change, we might loose the JOYSTICK mode... if (lastMode != FlightMode.JOYSTICK) { mFlightController.setVirtualStickModeEnabled(true, djiError -> { @@ -1894,7 +1952,7 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { mSendVirtualStickDataTask = new SendVelocityDataTask(); mSendVirtualStickDataTimer = new Timer(); mSendVirtualStickDataTimer.schedule(mSendVirtualStickDataTask, 100, 100); - }else{ + } else { mSendVirtualStickDataTask.repeat = 20; } } @@ -1907,7 +1965,7 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { @Override public void run() { if (mFlightController != null) { - if(--repeat <= 0){ + if (--repeat <= 0) { mSendVirtualStickDataTimer.cancel(); mSendVirtualStickDataTimer.purge(); mSendVirtualStickDataTimer = null; @@ -1922,12 +1980,12 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { parent.logMessageDJI("Motion done!\n"); return; } - if(++report > 20){ + if (++report > 20) { report = 0; - Log.e(TAG, ":"+mPitch+" "+ mRoll+" "+ mYaw+" "+ mThrottle); + Log.e(TAG, ":" + mPitch + " " + mRoll + " " + mYaw + " " + mThrottle); // parent.logMessageDJI(":"+mPitch+" "+ mRoll+" "+ mYaw+" "+ mThrottle); } - + mFlightController.sendVirtualStickFlightControlData( new FlightControlData(mPitch, mRoll, mYaw, mThrottle) , djiError -> { @@ -1941,16 +1999,15 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { // Follow me is not used by Mavlink for now, in the DJI implementation it for a // limit to a few meters from current location. - public void startSimpleFollowMe() - { - if(fmmo == null){ + public void startSimpleFollowMe() { + if (fmmo == null) { fmmo = DJISDKManager.getInstance().getMissionControl().getFollowMeMissionOperator(); } - final FollowMeMissionOperator followMeMissionOperator = fmmo; - if (followMeMissionOperator.getCurrentState().equals(MissionState.READY_TO_EXECUTE)){ - followMeMissionOperator.startMission(new FollowMeMission(FollowMeHeading.TOWARD_FOLLOW_POSITION,m_Latitude , m_Longitude, m_alt) + final FollowMeMissionOperator followMeMissionOperator = fmmo; + if (followMeMissionOperator.getCurrentState().equals(MissionState.READY_TO_EXECUTE)) { + followMeMissionOperator.startMission(new FollowMeMission(FollowMeHeading.TOWARD_FOLLOW_POSITION, m_Latitude, m_Longitude, m_alt) , djiError -> { - if(djiError != null){ + if (djiError != null) { parent.logMessageDJI(djiError.getDescription()); } else { parent.logMessageDJI("Mission Start: Successfully"); @@ -1959,13 +2016,13 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { } } - public void updateSimpleFollowMe(){ - if(fmmo == null){ + public void updateSimpleFollowMe() { + if (fmmo == null) { fmmo = DJISDKManager.getInstance().getMissionControl().getFollowMeMissionOperator(); } - final FollowMeMissionOperator followMeMissionOperator = fmmo; - if(followMeMissionOperator.getCurrentState().equals(FollowMeMissionState.EXECUTING)) { - followMeMissionOperator.updateFollowingTarget(new LocationCoordinate2D(m_Latitude , m_Longitude), + final FollowMeMissionOperator followMeMissionOperator = fmmo; + if (followMeMissionOperator.getCurrentState().equals(FollowMeMissionState.EXECUTING)) { + followMeMissionOperator.updateFollowingTarget(new LocationCoordinate2D(m_Latitude, m_Longitude), error -> { if (error != null) { parent.logMessageDJI(followMeMissionOperator.getCurrentState().getName() + " " + error.getDescription()); @@ -1976,12 +2033,13 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { } } - private int pictureNum=0; + private int pictureNum = 0; + void takePhoto() { SettingsDefinitions.ShootPhotoMode photoMode = SettingsDefinitions.ShootPhotoMode.SINGLE; - if(djiAircraft.getCamera() != null) { + if (djiAircraft.getCamera() != null) { djiAircraft.getCamera().startShootPhoto(djiError -> { if (djiError == null) { parent.logMessageDJI("Took photo"); @@ -2205,7 +2263,7 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { }); } - double getBearingBetweenWaypoints(double lat2,double lon2, double lat1,double lon1) { + double getBearingBetweenWaypoints(double lat2, double lon2, double lat1, double lon1) { // (all angles in degrees 0-360) lat1 = Math.toRadians(lat1); lat2 = Math.toRadians(lat2); @@ -2215,13 +2273,13 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { double y = Math.sin(lon2 - lon1) * Math.cos(lat2); double x = Math.cos(lat1) * Math.sin(lat2) - Math.sin(lat1) * Math.cos(lat2) * Math.cos(lon2 - lon1); - double z = Math.toDegrees(Math.atan2(y,x)); + double z = Math.toDegrees(Math.atan2(y, x)); if (z < 0.0) z += 360.0; return z; } // -------------------------------------------------------------------------------- - double getRangeBetweenWaypoints_m( double lat1,double lon1, float el1,double lat2,double lon2,float el2) { + double getRangeBetweenWaypoints_m(double lat1, double lon1, float el1, double lat2, double lon2, float el2) { final int R = 6371; // Radius of the earth double latDistance = Math.toRadians(lat2 - lat1); double lonDistance = Math.toRadians(lon2 - lon1); @@ -2242,7 +2300,7 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { private double rotation(double alpha, double beta) { double phi = Math.abs(beta - alpha) % 360; // This is either the distance or 360 - distance double distance = phi > 180 ? 360 - phi : phi; - double sign = (alpha - beta >= 0 && alpha - beta <= 180) || (alpha - beta <=-180 && alpha- beta>= -360) ? distance : distance*-1; + double sign = (alpha - beta >= 0 && alpha - beta <= 180) || (alpha - beta <= -180 && alpha - beta >= -360) ? distance : distance * -1; return sign; } @@ -2254,37 +2312,38 @@ public class DroneModel implements CommonCallbacks.CompletionCallback { double lon = coord.getAircraftLocation().getLongitude(); double newalt = coord.getAircraftLocation().getAltitude() + alt; - double dNorth = dForward * Math.cos(ro) - dRight*Math.sin(ro); - double dEast = dForward * Math.sin(ro) + dRight*Math.cos(ro); - double earth_radius=6378137.0; // Radius of "spherical" earth + double dNorth = dForward * Math.cos(ro) - dRight * Math.sin(ro); + double dEast = dForward * Math.sin(ro) + dRight * Math.cos(ro); + double earth_radius = 6378137.0; // Radius of "spherical" earth //Coordinate offsets in radians - double dLat = dNorth/earth_radius; - double dLon = dEast/(earth_radius*Math.cos(Math.toRadians(lat))); + double dLat = dNorth / earth_radius; + double dLon = dEast / (earth_radius * Math.cos(Math.toRadians(lat))); // New position in decimal degrees double newlat = lat + Math.toDegrees(dLat); double newlon = lon + Math.toDegrees(dLon); - parent.logMessageDJI("Was: lat " + lat + " lon " + lon + " newlat " + newlat + " newlon "+ newlon); - return new double[] {newlat, newlon, newalt}; + parent.logMessageDJI("Was: lat " + lat + " lon " + lon + " newlat " + newlat + " newlon " + newlon); + return new double[]{newlat, newlon, newalt}; } private double[] get_location_intermediet(double lat, double lon, double dist, double yaw) { double ro = Math.toRadians(yaw); double dNorth = dist * Math.cos(ro); - double dEast = dist * Math.sin(ro); - double earth_radius=6378137.0; // Radius of "spherical" earth + double dEast = dist * Math.sin(ro); + double earth_radius = 6378137.0; // Radius of "spherical" earth //Coordinate offsets in radians - double dLat = dNorth/earth_radius; - double dLon = dEast/(earth_radius*Math.cos(Math.toRadians(lat))); + double dLat = dNorth / earth_radius; + double dLon = dEast / (earth_radius * Math.cos(Math.toRadians(lat))); // New position in decimal degrees double newlat = lat + Math.toDegrees(dLat); double newlon = lon + Math.toDegrees(dLon); - parent.logMessageDJI("Was: lat " + lat + " lon " + lon + " newlat " + newlat + " newlon "+ newlon); - return new double[] {newlat, newlon}; - }} \ No newline at end of file + parent.logMessageDJI("Was: lat " + lat + " lon " + lon + " newlat " + newlat + " newlon " + newlon); + return new double[]{newlat, newlon}; + } +} \ No newline at end of file diff --git a/app/src/main/java/sq/rogue/rosettadrone/MAVLinkReceiver.java b/app/src/main/java/sq/rogue/rosettadrone/MAVLinkReceiver.java index b8a93d5..a78dfbf 100644 --- a/app/src/main/java/sq/rogue/rosettadrone/MAVLinkReceiver.java +++ b/app/src/main/java/sq/rogue/rosettadrone/MAVLinkReceiver.java @@ -3,30 +3,23 @@ package sq.rogue.rosettadrone; import android.util.Log; import com.MAVLink.Messages.MAVLinkMessage; -import com.MAVLink.common.msg_altitude; import com.MAVLink.common.msg_command_long; -import com.MAVLink.common.msg_global_position_int; import com.MAVLink.common.msg_manual_control; import com.MAVLink.common.msg_mission_ack; import com.MAVLink.common.msg_mission_count; import com.MAVLink.common.msg_mission_item; import com.MAVLink.common.msg_mission_request; +import com.MAVLink.common.msg_mission_request_int; import com.MAVLink.common.msg_param_request_read; import com.MAVLink.common.msg_param_set; import com.MAVLink.common.msg_set_mode; import com.MAVLink.common.msg_set_position_target_global_int; -import com.MAVLink.enums.MAV_CMD; -import com.MAVLink.enums.MAV_MISSION_RESULT; -import com.MAVLink.enums.MAV_PROTOCOL_CAPABILITY; -import com.MAVLink.enums.MAV_RESULT; import com.MAVLink.common.msg_set_position_target_local_ned; +import com.MAVLink.enums.MAV_CMD; +import com.MAVLink.enums.MAV_RESULT; import java.util.ArrayList; -import java.util.List; -import java.util.TimerTask; -import dji.common.error.DJIError; -import dji.common.flightcontroller.LocationCoordinate3D; import dji.common.mission.waypoint.Waypoint; import dji.common.mission.waypoint.WaypointAction; import dji.common.mission.waypoint.WaypointActionType; @@ -37,7 +30,6 @@ import dji.common.mission.waypoint.WaypointMissionGotoWaypointMode; import dji.common.mission.waypoint.WaypointMissionHeadingMode; import dji.common.mission.waypoint.WaypointMissionState; - import static com.MAVLink.common.msg_command_int.MAVLINK_MSG_ID_COMMAND_INT; import static com.MAVLink.common.msg_command_long.MAVLINK_MSG_ID_COMMAND_LONG; import static com.MAVLink.common.msg_heartbeat.MAVLINK_MSG_ID_HEARTBEAT; @@ -57,15 +49,14 @@ import static com.MAVLink.common.msg_set_mode.MAVLINK_MSG_ID_SET_MODE; import static com.MAVLink.common.msg_set_position_target_global_int.MAVLINK_MSG_ID_SET_POSITION_TARGET_GLOBAL_INT; import static com.MAVLink.common.msg_set_position_target_local_ned.MAVLINK_MSG_ID_SET_POSITION_TARGET_LOCAL_NED; import static com.MAVLink.enums.MAV_CMD.MAV_CMD_COMPONENT_ARM_DISARM; +import static com.MAVLink.enums.MAV_CMD.MAV_CMD_CONDITION_YAW; import static com.MAVLink.enums.MAV_CMD.MAV_CMD_DO_DIGICAM_CONTROL; -import static com.MAVLink.enums.MAV_CMD.MAV_CMD_DO_SET_CAM_TRIGG_DIST; +import static com.MAVLink.enums.MAV_CMD.MAV_CMD_DO_JUMP; import static com.MAVLink.enums.MAV_CMD.MAV_CMD_DO_SET_HOME; import static com.MAVLink.enums.MAV_CMD.MAV_CMD_DO_SET_MODE; import static com.MAVLink.enums.MAV_CMD.MAV_CMD_DO_SET_SERVO; import static com.MAVLink.enums.MAV_CMD.MAV_CMD_GET_HOME_POSITION; import static com.MAVLink.enums.MAV_CMD.MAV_CMD_MISSION_START; -import static com.MAVLink.enums.MAV_CMD.MAV_CMD_CONDITION_YAW; -import static com.MAVLink.enums.MAV_CMD.MAV_CMD_DO_SET_PARAMETER; import static com.MAVLink.enums.MAV_CMD.MAV_CMD_NAV_LAND; import static com.MAVLink.enums.MAV_CMD.MAV_CMD_NAV_LOITER_UNLIM; import static com.MAVLink.enums.MAV_CMD.MAV_CMD_NAV_RETURN_TO_LAUNCH; @@ -80,16 +71,16 @@ import static sq.rogue.rosettadrone.util.TYPE_WAYPOINT_MAX_ALTITUDE; import static sq.rogue.rosettadrone.util.TYPE_WAYPOINT_MAX_SPEED; import static sq.rogue.rosettadrone.util.TYPE_WAYPOINT_MIN_ALTITUDE; import static sq.rogue.rosettadrone.util.TYPE_WAYPOINT_MIN_SPEED; -import static com.MAVLink.enums.MAV_CMD.MAV_CMD_DO_JUMP; - import static sq.rogue.rosettadrone.util.safeSleep; -import dji.common.flightcontroller.virtualstick.FlightControlData; -import dji.common.util.CommonCallbacks; -import dji.sdk.mission.waypoint.WaypointMissionOperator; - public class MAVLinkReceiver { + private static final int MAV_MISSION_ACCEPTED = 0; private final String TAG = this.getClass().getSimpleName(); + + private float m_autoFlightSpeed = 2.0f; + private float m_maxFlightSpeed = 5.0f; + + private final int WP_STATE_INACTIVE = 0; private final int WP_STATE_REQ_COUNT = 1; private final int WP_STATE_REQ_WP = 2; @@ -115,11 +106,11 @@ public class MAVLinkReceiver { public void process(MAVLinkMessage msg) { // IS 0 is hart beat... - if(msg.msgid != 0) { + if (msg.msgid != 0) { Log.d(TAG, msg.toString()); - parent.logMessageDJI("Message: " + msg); - // parent.logMessageDJI(String.valueOf(msg)); - // parent.logMessageDJI(String.valueOf(msg.msgid)); + Log.d(TAG, "Message: " + msg); + // Log.d(TAG, String.valueOf(msg)); + // Log.d(TAG, String.valueOf(msg.msgid)); } @@ -136,7 +127,7 @@ public class MAVLinkReceiver { } // if (mModel.isSafetyEnabled()) { -// parent.logMessageDJI(parent.getResources().getString(R.string.safety_launch)); +// Log.d(TAG, parent.getResources().getString(R.string.safety_launch)); // return; // } @@ -152,62 +143,22 @@ public class MAVLinkReceiver { changeFlightMode((int) msg_cmd.param1); break; case MAV_CMD_NAV_LOITER_UNLIM: - // mModel.set_flight_mode(ATTI); + // mModel.set_flight_mode(ATTI); break; case MAV_CMD_NAV_TAKEOFF: - Log.d(TAG,"ALT = " + msg_cmd.param7); + Log.d(TAG, "ALT = " + msg_cmd.param7); mModel.mAirBorn = 0; - mModel.do_takeoff( msg_cmd.param7 * (double)1000.0); -/* - // Wait for command to be executed... - while( mModel.mAirBorn == 0) - safeSleep(250); - Log.d(TAG,"Wait for takeoff..."); - - if(mModel.mAirBorn == 1) { - Log.d(TAG,"Takeoff failed..."); - mModel.send_command_ack(MAV_CMD_NAV_TAKEOFF, MAV_RESULT.MAV_RESULT_FAILED); - } - else{ - mModel.send_command_ack(MAV_CMD_NAV_TAKEOFF, MAV_RESULT.MAV_RESULT_IN_PROGRESS); - - Log.d(TAG,"Takeoff succes..."); - int timeout = 0; - // If we took off, wait for command co complete... - while (mModel.m_alt < 1000.0 || timeout > (20*(1/0.250))) { - timeout+= 1; - safeSleep(250); - Log.d(TAG,"Wait for first altitude..."); - } - safeSleep(500); - timeout = 0; - // If we are airborne, or was airborne from the start... - if (mModel.m_alt >= 800) { - float desired_alt = (msg_cmd.param7*(float)1000.0) - mModel.m_alt; - // Climb out to 99% of requested altitude, however 100% is set, just to avoid deadlock... - while (mModel.m_alt < desired_alt*0.98 || timeout > (30*(1/0.250))){ - mModel.do_set_motion_relative(MAV_CMD_NAV_TAKEOFF, 0, 0, msg_cmd.param7 - (mModel.m_alt / (float) 1000.0), 0, 0, 0, 0, 0, 0b00011111111000); - timeout+= 1; - safeSleep(250); - Log.d(TAG, "Climb out..."+mModel.m_alt); - } - Log.d(TAG, "Climb out completed..."+mModel.m_alt); - }else{ - Log.d(TAG, "Climb out failed..."); - } - } - - */ + mModel.do_takeoff(msg_cmd.param7 * (float) 1000.0); + mModel.send_command_ack(MAV_CMD_NAV_TAKEOFF, MAV_RESULT.MAV_RESULT_IN_PROGRESS); break; case MAV_CMD_NAV_LAND: mModel.do_land(); break; case MAV_CMD_DO_SET_HOME: - parent.logMessageDJI("LAT = " + msg_cmd.param5); - parent.logMessageDJI("LONG = " + msg_cmd.param6); - parent.logMessageDJI("ALT = " + msg_cmd.param7); - - // TODO; + Log.d(TAG, "LAT = " + msg_cmd.param5); + Log.d(TAG, "LONG = " + msg_cmd.param6); + Log.d(TAG, "ALT = " + msg_cmd.param7); + mModel.set_home_position(msg_cmd.param5, msg_cmd.param6); break; case MAV_CMD_NAV_RETURN_TO_LAUNCH: Log.d(TAG, "MAV_CMD_NAV_RETURN_TO_LAUNCH..."); @@ -235,23 +186,22 @@ public class MAVLinkReceiver { break; case MAV_CMD_CONDITION_YAW: - parent.logMessageDJI("Yaw = " + msg_cmd.param1); + Log.d(TAG, "Yaw = " + msg_cmd.param1); // If absolute yaw... - if( msg_cmd.param4 == 0) { + if (msg_cmd.param4 == 0) { mModel.send_command_ack(MAV_CMD_CONDITION_YAW, MAV_RESULT.MAV_RESULT_IN_PROGRESS); mModel.do_set_motion_absolute( 0, 0, 0, - msg_cmd.param1*(float)(Math.PI/180.0), + msg_cmd.param1 * (float) (Math.PI / 180.0), 0, 0, 0, 10, 0b1111001111111111); - } - else{ + } else { mModel.send_command_ack(MAV_CMD_CONDITION_YAW, MAV_RESULT.MAV_RESULT_UNSUPPORTED); } break; @@ -263,7 +213,7 @@ public class MAVLinkReceiver { // JUMP is just a test function to enter the Timeline... case MAV_CMD_DO_JUMP: Log.d(TAG, "Start Timeline..."); - mModel.echoLoadedMission(); + // mModel.echoLoadedMission(); break; } break; @@ -275,7 +225,7 @@ public class MAVLinkReceiver { case MAVLINK_MSG_ID_SET_MODE: msg_set_mode msg_set_mode = (msg_set_mode) msg; - parent.logMessageDJI("MAVLINK_MSG_ID_SET_MODE: " + msg_set_mode.custom_mode); + Log.d(TAG, "MAVLINK_MSG_ID_SET_MODE: " + msg_set_mode.custom_mode); changeFlightMode((int) msg_set_mode.custom_mode); break; @@ -284,16 +234,16 @@ public class MAVLinkReceiver { **************************************************************/ case MAVLINK_MSG_ID_SET_POSITION_TARGET_LOCAL_NED: msg_set_position_target_local_ned msg_param = (msg_set_position_target_local_ned) msg; - if ( ((msg_param.type_mask & 0b0000100000000111) == 0x007) ){ // If no move and we use yaw rate... + if (((msg_param.type_mask & 0b0000100000000111) == 0x007)) { // If no move and we use yaw rate... mModel.mAutonomy = false; // Velocity must halt autonomy (as Autonomy tries to reach a point, whule veliciity tries to set a speed) - mModel.do_set_motion_velocity(msg_param.vx, msg_param.vy, msg_param.vz, (float)Math.toDegrees(msg_param.yaw_rate), msg_param.type_mask); + mModel.do_set_motion_velocity(msg_param.vx, msg_param.vy, msg_param.vz, (float) Math.toDegrees(msg_param.yaw_rate), msg_param.type_mask); mModel.send_command_ack(MAVLINK_MSG_ID_SET_POSITION_TARGET_LOCAL_NED, MAV_RESULT.MAV_RESULT_ACCEPTED); } else { mModel.send_command_ack(MAVLINK_MSG_ID_SET_POSITION_TARGET_LOCAL_NED, MAV_RESULT.MAV_RESULT_IN_PROGRESS); mModel.do_set_motion_relative( MAVLINK_MSG_ID_SET_POSITION_TARGET_LOCAL_NED, - (double)msg_param.x, - (double)msg_param.y, + (double) msg_param.x, + (double) msg_param.y, msg_param.z, msg_param.yaw, msg_param.vx, @@ -309,15 +259,15 @@ public class MAVLinkReceiver { msg_set_position_target_global_int msg_param_4 = (msg_set_position_target_global_int) msg; // If position is set to zero then it must be a velocity command... We should use rather the mask ... - if ( ((msg_param_4.type_mask & 0b0000100000000111) == 0x007) ){ // If no move and we use yaw rate... + if (((msg_param_4.type_mask & 0b0000100000000111) == 0x007)) { // If no move and we use yaw rate... mModel.mAutonomy = false; - mModel.do_set_motion_velocity_NED(msg_param_4.vx, msg_param_4.vy, msg_param_4.vz, (float)Math.toDegrees(msg_param_4.yaw_rate),msg_param_4.type_mask); + mModel.do_set_motion_velocity_NED(msg_param_4.vx, msg_param_4.vy, msg_param_4.vz, (float) Math.toDegrees(msg_param_4.yaw_rate), msg_param_4.type_mask); mModel.send_command_ack(MAVLINK_MSG_ID_SET_POSITION_TARGET_GLOBAL_INT, MAV_RESULT.MAV_RESULT_ACCEPTED); - } else{ + } else { mModel.send_command_ack(MAVLINK_MSG_ID_SET_POSITION_TARGET_GLOBAL_INT, MAV_RESULT.MAV_RESULT_IN_PROGRESS); mModel.do_set_motion_absolute( - (double)msg_param_4.lat_int/10000000, - (double)msg_param_4.lon_int/10000000, + (double) msg_param_4.lat_int / 10000000, + (double) msg_param_4.lon_int / 10000000, msg_param_4.alt, msg_param_4.yaw, msg_param_4.vx, @@ -331,7 +281,7 @@ public class MAVLinkReceiver { // This command must be sent at 1Hz minimum... case MAVLINK_MSG_ID_MANUAL_CONTROL: msg_manual_control msg_param_5 = (msg_manual_control) msg; - mModel.do_set_motion_velocity(msg_param_5.x / (float) 100.0, msg_param_5.y / (float) 100.0, msg_param_5.z / (float) 260.0, msg_param_5.r / (float) 50.0, 0b0000100000111000); + mModel.do_set_motion_velocity(msg_param_5.x / (float) 100.0, msg_param_5.y / (float) 100.0, msg_param_5.z / (float) 260.0, msg_param_5.r / (float) 50.0, 0b0000100000111000); mModel.send_command_ack(MAVLINK_MSG_ID_MANUAL_CONTROL, MAV_RESULT.MAV_RESULT_ACCEPTED); break; @@ -396,36 +346,52 @@ public class MAVLinkReceiver { * These messages are used when GCS uploads a mission to MAV * **************************************************************/ + // Start load new mission... case MAVLINK_MSG_ID_MISSION_COUNT: - generateNewMission(); - //mModel.getMissionControl().getWaypointMissionOperator().getLoadedMission().getWaypointList().clear(); + // Is this message to this system... msg_mission_count msg_count = (msg_mission_count) msg; - if (mModel.getSystemId() != msg_count.target_system) { return; } - parent.logMessageDJI("Mission Counter: " + msg_count.count); + + WaypointMission y = mModel.getWaypointMissionOperator().getLoadedMission(); + if (y != null) { + y.getWaypointList().clear(); + } + generateNewMission(); + + // Get the expected counter... + Log.d(TAG, "Mission Counter: " + msg_count.count); mNumGCSWaypoints = msg_count.count; wpState = WP_STATE_REQ_WP; mMissionItemList = new ArrayList(); mModel.request_mission_item(0); + + // Send response... + msg_mission_request_int msg_out = new msg_mission_request_int(); + msg_out.mission_type = ((msg_mission_count) msg).mission_type; + mModel.sendMessage(msg_out); break; - case MAVLINK_MSG_ID_MISSION_ITEM: + case MAVLINK_MSG_ID_MISSION_ITEM: // 0x73 + { + // Is this message to this system... msg_mission_item msg_item = (msg_mission_item) msg; - if (mModel.getSystemId() != msg_item.target_system) { break; } - parent.logMessageDJI("Add mission: " + msg_item.seq ); + Log.d(TAG, "Add mission: " + msg_item.seq); - if(((msg_mission_item) msg).command == MAV_CMD_NAV_WAYPOINT) { + // Somehow the GOTO from QGroundControl does not issue a mission count... + if (mMissionItemList == null && msg_item.command == MAV_CMD_NAV_WAYPOINT) { Log.d(TAG, "Lat = " + msg_item.x); Log.d(TAG, "Lon = " + msg_item.y); Log.d(TAG, "ALT = " + msg_item.z); + mModel.goto_position(msg_item.x, msg_item.y, msg_item.z, 0); + /* mModel.do_set_motion_absolute( - (double) msg_item.x / 10000000, - (double) msg_item.y / 10000000, + (double) msg_item.x, // * 10000000, + (double) msg_item.y, // * 10000000, msg_item.z, msg_item.param4, 0, @@ -433,12 +399,11 @@ public class MAVLinkReceiver { 0, 0, 0b0000111111111000); - } - else { - // Somehow the GOTO from QGroundControl does not issue a mission count... + */ + } else { if (mMissionItemList == null) { - parent.logMessageDJI("Special single point mission!"); + Log.d(TAG, "Special single point mission!"); generateNewMission(); mMissionItemList = new ArrayList(); mNumGCSWaypoints = 1; @@ -452,33 +417,34 @@ public class MAVLinkReceiver { if (msg_item.seq == mNumGCSWaypoints - 1) { wpState = WP_STATE_INACTIVE; finalizeNewMission(); - // mModel.send_mission_ack(); } else { mModel.request_mission_item((msg_item.seq + 1)); } } - break; + } + break; /************************************************************** * These messages from GCS direct a mission-related action * **************************************************************/ case MAVLINK_MSG_ID_MISSION_SET_CURRENT: - parent.logMessageDJI("MSN: received set_current from GCS"); - // TODO + Log.d(TAG, "MSN: received set_current from GCS"); + // TODO:::::: break; + // Clear all mission states... case MAVLINK_MSG_ID_MISSION_CLEAR_ALL: - parent.logMessageDJI("MSN: received clear_all from GCS"); - WaypointMission y = mModel.getWaypointMissionOperator().getLoadedMission(); - if( y != null){ - y.getWaypointList().clear(); + Log.d(TAG, "MSN: received clear_all from GCS"); + WaypointMission ym = mModel.getWaypointMissionOperator().getLoadedMission(); + if (ym != null) { + ym.getWaypointList().clear(); } break; } - } + // Support function... public long getTimestampLastGCSHeartbeat() { return mTimeStampLastGCSHeartbeat; } @@ -488,7 +454,7 @@ public class MAVLinkReceiver { if (flightMode == ArduCopterFlightModes.AUTO) { if (mModel.getWaypointMissionOperator().getCurrentState() == WaypointMissionState.EXECUTION_PAUSED) { - parent.logMessageDJI("Resuming mission"); + Log.d(TAG, "Resuming mission"); mModel.resumeWaypointMission(); } else if (mModel.getWaypointMissionOperator().getCurrentState() == WaypointMissionState.READY_TO_EXECUTE) mModel.startWaypointMission(); @@ -504,10 +470,11 @@ public class MAVLinkReceiver { } + // Generate a new Mission element, with default speed... protected void generateNewMission() { mBuilder = new WaypointMission.Builder(). - autoFlightSpeed(2.0f). - maxFlightSpeed(5.0f). + autoFlightSpeed(m_autoFlightSpeed). + maxFlightSpeed(m_maxFlightSpeed). setExitMissionOnRCSignalLostEnabled(false). finishedAction(WaypointMissionFinishedAction.NO_ACTION). gotoFirstWaypointMode(WaypointMissionGotoWaypointMode.SAFELY). @@ -526,9 +493,9 @@ public class MAVLinkReceiver { ArrayList dji_wps = new ArrayList(); Waypoint currentWP = null; - parent.logMessageDJI("=============================="); - parent.logMessageDJI("Waypoint Mission Uploading"); - parent.logMessageDJI("=============================="); + Log.d(TAG, "=============================="); + Log.d(TAG, "Waypoint Mission Uploading"); + Log.d(TAG, "=============================="); boolean stopUpload = false; int errorCode = 0; @@ -538,77 +505,77 @@ public class MAVLinkReceiver { waypoint_loop: for (msg_mission_item m : this.mMissionItemList) { - parent.logMessageDJI(String.valueOf(m.command)); + Log.d(TAG, String.valueOf(m.command)); switch (m.command) { case MAV_CMD.MAV_CMD_NAV_TAKEOFF: - parent.logMessageDJI("Takeoff..."); -// parent.logMessageDJI("P1 = " + m.param1); -// parent.logMessageDJI("P2 = " + m.param2); -// parent.logMessageDJI("P3 = " + m.param3); -// parent.logMessageDJI("P4 = " + m.param4); -// parent.logMessageDJI("x = " + m.x); -// parent.logMessageDJI("y = " + m.y); -// parent.logMessageDJI("z = " + m.z); + Log.d(TAG, "Takeoff..."); + Log.d(TAG, "P1 = " + m.param1); + Log.d(TAG, "P2 = " + m.param2); + Log.d(TAG, "P3 = " + m.param3); + Log.d(TAG, "P4 = " + m.param4); + Log.d(TAG, "x = " + m.x); + Log.d(TAG, "y = " + m.y); + Log.d(TAG, "z = " + m.z); break; case MAV_CMD.MAV_CMD_NAV_WAYPOINT: // TODO: Is this to handle the first way point being the current location ???? if (isHome) { - parent.logMessageDJI("Is Home..."); + Log.d(TAG, "Is Home..."); // homeValue = m.z; isHome = false; } //else - { - if ((m.z) > 500) { // TODO: Shuld reqest max altitude not assume 500... + { + if ((m.z) > 500) { // TODO: Shuld reqest max altitude not assume 500... // m.z = 500; - parent.runOnUiThread(new Runnable() { - @Override - public void run() { - NotificationHandler.notifyAlert(parent, TYPE_WAYPOINT_MAX_ALTITUDE, null, null); - } - }); - stopUpload = true; - break waypoint_loop; + parent.runOnUiThread(new Runnable() { + @Override + public void run() { + NotificationHandler.notifyAlert(parent, TYPE_WAYPOINT_MAX_ALTITUDE, null, null); + } + }); + stopUpload = true; + break waypoint_loop; - } else if ((m.z) < -200) { // TODO: hmm so we can not take off from a mountain and fly down?? ... + } else if ((m.z) < -200) { // TODO: hmm so we can not take off from a mountain and fly down?? ... // m.z = -200; - parent.runOnUiThread(new Runnable() { - @Override - public void run() { - NotificationHandler.notifyAlert(parent, TYPE_WAYPOINT_MIN_ALTITUDE, null, null); - } - }); - stopUpload = true; - break waypoint_loop; - } - - currentWP = new Waypoint(m.x, m.y, m.z); // TODO check altitude conversion - - if (m.param1 > 0) - currentWP.addAction(new WaypointAction(WaypointActionType.STAY, (int) m.param1 * 1000)); // milliseconds... - - if (m.param2 > 0) - currentWP.addAction(new WaypointAction(WaypointActionType.ROTATE_AIRCRAFT, (int)(m.param2 * 180.0/3.141592))); // +-180 deg... - - if (curvedFlightPath) { - currentWP.cornerRadiusInMeters = flightPathRadius; - } - - dji_wps.add(currentWP); - - parent.logMessageDJI("Waypoint: " + m.x + ", " + m.y + " at " + m.z + " m " + m.param2 + " Yaw " + m.param1 + " Delay "); -// parent.logMessageDJI("P1 = " + m.param1); -// parent.logMessageDJI("P2 = " + m.param2); -// parent.logMessageDJI("P3 = " + m.param3); -// parent.logMessageDJI("P4 = " + m.param4); -// parent.logMessageDJI("x = " + m.x); -// parent.logMessageDJI("y = " + m.y); -// parent.logMessageDJI("z = " + m.z); + parent.runOnUiThread(new Runnable() { + @Override + public void run() { + NotificationHandler.notifyAlert(parent, TYPE_WAYPOINT_MIN_ALTITUDE, null, null); + } + }); + stopUpload = true; + break waypoint_loop; } - break; + + currentWP = new Waypoint(m.x, m.y, m.z); // TODO check altitude conversion + + if (m.param1 > 0) + currentWP.addAction(new WaypointAction(WaypointActionType.STAY, (int) m.param1 * 1000)); // milliseconds... + + if (m.param2 > 0) + currentWP.addAction(new WaypointAction(WaypointActionType.ROTATE_AIRCRAFT, (int) (m.param2 * 180.0 / 3.141592))); // +-180 deg... + + if (curvedFlightPath) { + currentWP.cornerRadiusInMeters = flightPathRadius; + } + + dji_wps.add(currentWP); + + Log.d(TAG, "Waypoint: " + m.x + ", " + m.y + " at " + m.z + " m " + m.param2 + " Yaw " + m.param1 + " Delay "); +// Log.d(TAG, "P1 = " + m.param1); +// Log.d(TAG, "P2 = " + m.param2); +// Log.d(TAG, "P3 = " + m.param3); +// Log.d(TAG, "P4 = " + m.param4); +// Log.d(TAG, "x = " + m.x); +// Log.d(TAG, "y = " + m.y); +// Log.d(TAG, "z = " + m.z); + } + break; case MAV_CMD.MAV_CMD_DO_CHANGE_SPEED: // final DialogInterface.OnClickListener onClickListener = new DialogInterface.OnClickListener() { // @Override @@ -649,13 +616,13 @@ public class MAVLinkReceiver { case MAV_CMD.MAV_CMD_DO_MOUNT_CONTROL: currentWP.addAction(new WaypointAction(WaypointActionType.GIMBAL_PITCH, (int) m.param1)); - parent.logMessageDJI("Set gimbal pitch: " + m.param1); + Log.d(TAG, "Set gimbal pitch: " + m.param1); break; case MAV_CMD.MAV_CMD_IMAGE_START_CAPTURE: if (currentWP != null) currentWP.addAction(new WaypointAction(WaypointActionType.START_TAKE_PHOTO, 0)); - parent.logMessageDJI("Take photo"); + Log.d(TAG, "Take photo"); break; case MAV_CMD.MAV_CMD_DO_SET_CAM_TRIGG_DIST: @@ -672,28 +639,28 @@ public class MAVLinkReceiver { case MAV_CMD.MAV_CMD_NAV_RETURN_TO_LAUNCH: mBuilder.finishedAction(WaypointMissionFinishedAction.GO_HOME); - parent.logMessageDJI("Waypoint RTL"); + Log.d(TAG, "Waypoint RTL"); break; } } if (stopUpload) { - parent.logMessageDJI("Waypoint upload aborted due to invalid parameters"); + Log.d(TAG, "Waypoint upload aborted due to invalid parameters"); } else { - parent.logMessageDJI("Speed for mission will be " + mBuilder.getAutoFlightSpeed() + " m/s"); - parent.logMessageDJI("=============================="); + Log.d(TAG, "Speed for mission will be " + mBuilder.getAutoFlightSpeed() + " m/s"); + Log.d(TAG, "=============================="); ArrayList correctedWps; if (triggerDistanceEnabled) { - parent.logMessageDJI("ADDING SURVEY WAYPOINTS"); + Log.d(TAG, "ADDING SURVEY WAYPOINTS"); correctedWps = addSurveyWaypoints(dji_wps, triggerDistance); mBuilder.flightPathMode(WaypointMissionFlightPathMode.NORMAL); } else { correctedWps = addIntermediateWaypoints(dji_wps); } logWaypointstoRD(correctedWps); - parent.logMessageDJI("WP size " + correctedWps.size()); + Log.d(TAG, "WP size " + correctedWps.size()); safeSleep(200); mBuilder.waypointList(correctedWps).waypointCount(correctedWps.size()); safeSleep(200); @@ -706,11 +673,11 @@ public class MAVLinkReceiver { } private void logWaypointstoRD(ArrayList wps) { - parent.logMessageDJI("=============================="); - parent.logMessageDJI("Waypoints with intermediate wps"); - parent.logMessageDJI("=============================="); + Log.d(TAG, "=============================="); + Log.d(TAG, "Waypoints with intermediate wps"); + Log.d(TAG, "=============================="); for (Waypoint wp : wps) - parent.logMessageDJI(wp.coordinate.getLatitude() + ", " + wp.coordinate.getLongitude() + ", " + wp.altitude); + Log.d(TAG, wp.coordinate.getLatitude() + ", " + wp.coordinate.getLongitude() + ", " + wp.altitude); } private ArrayList addSurveyWaypoints(ArrayList wpIn, float triggerDistance) { @@ -746,7 +713,7 @@ public class MAVLinkReceiver { for (int i = 1; currentDistance < distanceBetweenPoints; i++) { - parent.logMessageDJI(String.valueOf("WAYPOINT ADDED AT " + currentDistance)); + Log.d(TAG, String.valueOf("WAYPOINT ADDED AT " + currentDistance)); Waypoint surveyWaypoint = createIntermediateWaypoint(previousWaypoint, currentWaypoint, i, numSurveyWaypoints, currentWaypoint.altitude, 0); surveyWaypoint.addAction(new WaypointAction(WaypointActionType.STAY, 1)); @@ -773,20 +740,20 @@ public class MAVLinkReceiver { ArrayList wpOut = new ArrayList<>(); // If this is a goto position ... we must add at least one more waypoint (minimum 2 on DJI) - if ( wpIn.size() == 1){ + if (wpIn.size() == 1) { // Get current position... double lat = mModel.get_current_lat(); double lon = mModel.get_current_lon(); - float alt = mModel.get_current_alt(); - Waypoint wpPrevious = new Waypoint(lat,lon,alt); + float alt = mModel.get_current_alt(); + Waypoint wpPrevious = new Waypoint(lat, lon, alt); Waypoint wpCurrent = wpIn.get(0); - parent.logMessageDJI("Single point WP distance: " + String.valueOf(getRangeBetweenWaypoints_m(wpPrevious, wpCurrent))); + Log.d(TAG, "Single point WP distance: " + String.valueOf(getRangeBetweenWaypoints_m(wpPrevious, wpCurrent))); float waypointIncrement = (wpCurrent.altitude - wpPrevious.altitude) / 2; Waypoint intermediateWaypoint = createIntermediateWaypoint(wpPrevious, wpCurrent, 1, 1, 0, waypointIncrement); // Insert the intermediate wp at the beginning of the list... - wpIn.add(0,intermediateWaypoint); + wpIn.add(0, intermediateWaypoint); } Waypoint wpPrevious = wpIn.get(0); @@ -798,13 +765,13 @@ public class MAVLinkReceiver { wpOut.add(wpCurrent); continue; } - parent.logMessageDJI("WP dist: " + String.valueOf(getRangeBetweenWaypoints_m(wpCurrent, wpPrevious))); + Log.d(TAG, "WP dist: " + String.valueOf(getRangeBetweenWaypoints_m(wpCurrent, wpPrevious))); if (getRangeBetweenWaypoints_m(wpCurrent, wpPrevious) > MAX_WAYPOINT_DISTANCE) { int numIntermediateWps = (int) getRangeBetweenWaypoints_m(wpCurrent, wpPrevious) / MAX_WAYPOINT_DISTANCE; shouldNotify = true; - parent.logMessageDJI("creating " + numIntermediateWps + " intermediate wps"); + Log.d(TAG, "creating " + numIntermediateWps + " intermediate wps"); float waypointIncrement = (wpCurrent.altitude - wpPrevious.altitude) / (numIntermediateWps + 1); - parent.logMessageDJI("WAYPOINT INCREMENT + " + waypointIncrement); + Log.d(TAG, "WAYPOINT INCREMENT + " + waypointIncrement); float prevIntermediaryAltitude = 0; for (int i = 0; i < numIntermediateWps; i++) { Waypoint intermediateWaypoint = createIntermediateWaypoint(wpPrevious, wpCurrent, i + 1, numIntermediateWps, prevIntermediaryAltitude, waypointIncrement); diff --git a/app/src/main/java/sq/rogue/rosettadrone/MainActivity.java b/app/src/main/java/sq/rogue/rosettadrone/MainActivity.java index 8239727..9cd50dc 100644 --- a/app/src/main/java/sq/rogue/rosettadrone/MainActivity.java +++ b/app/src/main/java/sq/rogue/rosettadrone/MainActivity.java @@ -5,7 +5,6 @@ package sq.rogue.rosettadrone; // Hide keyboard: https://stackoverflow.com/questions/16495440/how-to-hide-keyboard-by-default-and-show-only-when-click-on-edittext // MenuItemTetColor: RPP @ https://stackoverflow.com/questions/31713628/change-menuitem-text-color-programmatically -import android.app.AlertDialog; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -41,15 +40,8 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.PopupMenu; -import android.widget.ScrollView; import android.widget.Toast; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentTransaction; -import androidx.preference.PreferenceManager; - import com.MAVLink.MAVLinkPacket; import com.MAVLink.Messages.MAVLinkMessage; import com.MAVLink.Parser; @@ -60,7 +52,6 @@ import com.amap.api.maps.model.BitmapDescriptorFactory; import com.amap.api.maps.model.LatLng; import com.amap.api.maps.model.Marker; import com.amap.api.maps.model.MarkerOptions; -import com.dji.megatronking.stringfog.fdd.dgh; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -87,7 +78,11 @@ import java.util.TimerTask; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import dji.common.camera.ResolutionAndFrameRate; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.preference.PreferenceManager; import dji.common.camera.SettingsDefinitions; import dji.common.error.DJIError; import dji.common.error.DJISDKError; @@ -101,19 +96,21 @@ import dji.sdk.products.Aircraft; import dji.sdk.sdkmanager.DJISDKInitEvent; import dji.sdk.sdkmanager.DJISDKManager; import sq.rogue.rosettadrone.logs.LogFragment; -import sq.rogue.rosettadrone.settings.AiActivity; -import sq.rogue.rosettadrone.settings.GaodeActivity; -import sq.rogue.rosettadrone.settings.MapActivity; import sq.rogue.rosettadrone.settings.SettingsActivity; +import sq.rogue.rosettadrone.settings.Waypoint1Activity; +import sq.rogue.rosettadrone.settings.Waypoint2Activity; import sq.rogue.rosettadrone.video.NativeHelper; import sq.rogue.rosettadrone.video.VideoService; import static com.google.android.material.snackbar.Snackbar.LENGTH_LONG; import static sq.rogue.rosettadrone.util.safeSleep; -public class MainActivity extends AppCompatActivity implements DJICodecManager.YuvDataCallback{ +// import sq.rogue.rosettadrone.settings.Waypoint1Activity; +// import sq.rogue.rosettadrone.settings.Waypoint2Activity; - public static final String FLAG_CONNECTION_CHANGE = "dji_sdk_connection_change"; +public class MainActivity extends AppCompatActivity { + + // public static final String FLAG_CONNECTION_CHANGE = "dji_sdk_connection_change"; private final static int RESULT_SETTINGS = 1001; private final static int RESULT_HELP = 1002; private static int compare_height = 0; @@ -132,6 +129,7 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y public static boolean FLAG_DRONE_FLIGHT_PATH_MODE_CHANGED = false; public static boolean FLAG_DRONE_MAX_HEIGHT_CHANGED = false; + // private com.google.android.gms.maps.SupportMapFragment mapView; private MapView mapView; private AMap aMap; private double droneLocationLat, droneLocationLng; @@ -139,28 +137,30 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y // private FlightController mFlightController; private static BaseProduct mProduct; - private final String TAG = MainActivity.class.getSimpleName(); - private final int GCS_TIMEOUT_mSEC = 2000; + private Model mProductModel; + private final String TAG = MainActivity.class.getSimpleName(); + private final int GCS_TIMEOUT_mSEC = 2000; private Handler mDJIHandler; private Handler mUIHandler; private LogFragment logDJI; private LogFragment logOutbound; private LogFragment logInbound; - private int navState = -1; + private int navState = -1; private SharedPreferences prefs; - private String mNewOutbound = ""; - private String mNewInbound = ""; - private String mNewDJI = ""; + private String mNewOutbound = ""; + private String mNewInbound = ""; + private String mNewDJI = ""; private DatagramSocket socket; private DroneModel mModel; + private MAVLinkReceiver mMavlinkReceiver; private Parser mMavlinkParser; private GCSCommunicatorAsyncTask mGCSCommunicator; private boolean connectivityHasChanged = false; - private boolean shouldConnect = false; - private boolean gui_enabled = true; + private boolean shouldConnect = false; + private boolean gui_enabled = true; private Button mBtnSafety; - private boolean stat = false; // Is it safe to takeoff.... + private boolean stat = false; // Is it safe to takeoff.... private boolean mExternalVideoOut = true; private String mvideoIPString; @@ -182,7 +182,8 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y protected SharedPreferences sharedPreferences; private Runnable djiUpdateRunnable = () -> { - Intent intent = new Intent(FLAG_CONNECTION_CHANGE); + Intent intent = new Intent(RDApplication.FLAG_CONNECTION_CHANGE); +// Intent intent = new Intent(FLAG_CONNECTION_CHANGE); sendBroadcast(intent); }; @@ -193,7 +194,7 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y @Override public void run() { - if(!gui_enabled) { + if (!gui_enabled) { try { if (!mNewDJI.equals("")) { // ((LogFragment) logPagerAdapter.getItem(0)).appendLogText(mNewDJI); @@ -221,7 +222,7 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y }; - private void initPacketizer(){ + private void initPacketizer() { Log.e(TAG, "initPacketizer"); String address = "127.0.0.1"; @@ -245,9 +246,9 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y Log.e(TAG, "Ip Address: " + mvideoIPString); //------------------------------------------------------------ - videoPort = Integer.parseInt(Objects.requireNonNull(sharedPreferences.getString("pref_video_port", "5600"))); + videoPort = Integer.parseInt(Objects.requireNonNull(sharedPreferences.getString("pref_video_port", "5600"))); mVideoBitrate = Integer.parseInt(Objects.requireNonNull(sharedPreferences.getString("pref_video_bitrate", "2"))); - mEncodeSpeed = Integer.parseInt(Objects.requireNonNull(sharedPreferences.getString("pref_encode_speed", "2"))); + mEncodeSpeed = Integer.parseInt(Objects.requireNonNull(sharedPreferences.getString("pref_encode_speed", "2"))); //------------------------------------------------------------ @@ -256,10 +257,10 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y safeSleep(500); doBindService(); - if (isTranscodedVideoFeedNeeded()){ + if (isTranscodedVideoFeedNeeded()) { // The one were we get transcode data... VideoFeeder.getInstance().setTranscodingDataRate(mVideoBitrate); - logMessageDJI("set rate to "+ mVideoBitrate); + logMessageDJI("set rate to " + mVideoBitrate); } //------------------------------------------------------------ @@ -273,11 +274,10 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y private ServiceConnection mConnection = new ServiceConnection() { @Override - public void onServiceConnected(ComponentName componentName, IBinder iBinder) - { - Log.e(TAG, "onServiceConnected "+mvideoIPString); - mService = ((VideoService.LocalBinder)iBinder).getInstance(); - mService.setParameters(mvideoIPString,videoPort,mVideoBitrate,mEncodeSpeed); + public void onServiceConnected(ComponentName componentName, IBinder iBinder) { + Log.e(TAG, "onServiceConnected " + mvideoIPString); + mService = ((VideoService.LocalBinder) iBinder).getInstance(); + mService.setParameters(mvideoIPString, videoPort, mVideoBitrate, mEncodeSpeed); if (prefs.getBoolean("pref_enable_dualvideo", true)) { mService.setDualVideo(true); @@ -287,15 +287,13 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y } @Override - public void onServiceDisconnected(ComponentName componentName) - { + public void onServiceDisconnected(ComponentName componentName) { Log.e(TAG, "onServiceDisconnected"); mService = null; } }; - private void doBindService() - { + private void doBindService() { // Establish a connection with the service. We use an explicit // class name because we want a specific service implementation that // we know will be running in our own process (and thus won't be @@ -305,10 +303,8 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y mIsBound = true; } - private void doUnbindService() - { - if (mIsBound) - { + private void doUnbindService() { + if (mIsBound) { // Detach our existing connection. unbindService(mConnection); mIsBound = false; @@ -354,12 +350,12 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y } } - // if(compare_height == 0) { - videostreamPreviewTtView.setSurfaceTextureListener(mSurfaceTextureListener); - // } - // else { - // videostreamPreviewTtViewSmall.setSurfaceTextureListener(mSurfaceTextureListener); - // } + // if(compare_height == 0) { + videostreamPreviewTtView.setSurfaceTextureListener(mSurfaceTextureListener); + // } + // else { + // videostreamPreviewTtViewSmall.setSurfaceTextureListener(mSurfaceTextureListener); + // } // If we use a camera... Remove Listeners if needed... if (mCamera != null) { @@ -483,7 +479,7 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y return (latitude > -90 && latitude < 90 && longitude > -180 && longitude < 180) && (latitude != 0f && longitude != 0f); } - private void updateDroneLocation(){ + private void updateDroneLocation() { LatLng pos = new LatLng(droneLocationLat, droneLocationLng); @@ -524,6 +520,12 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y setContentView(R.layout.activity_gui); mProduct = RDApplication.getProductInstance(); // Should be set by Connection ... + try { + mProductModel = mProduct.getModel(); + }catch(Exception e){ + Log.d(TAG, "exception", e); + mProductModel = Model.MAVIC_PRO; // Just a dummy value should we be in test mode... (No Target) + } /* FrameLayout wv = findViewById(R.id.compass_container); wv.getLayoutParams().height = FrameLayout.LayoutParams.MATCH_PARENT; // LayoutParams: android.view.ViewGroup.LayoutParams @@ -552,7 +554,7 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y Intent aoaIntent = getIntent(); if (aoaIntent != null) { String action = aoaIntent.getAction(); - assert action != null; + // assert action != null; if (action == (UsbManager.ACTION_USB_ACCESSORY_ATTACHED)) { Intent attachedIntent = new Intent(); @@ -578,12 +580,12 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y mBtnSafety.setOnClickListener(v -> { Drawable connectedDrawable; stat = !stat; - if(stat) { - connectedDrawable = getResources().getDrawable(R.drawable.ic_lock_outline_secondary_24dp,null); + if (stat) { + connectedDrawable = getResources().getDrawable(R.drawable.ic_lock_outline_secondary_24dp, null); mBtnSafety.setBackground(connectedDrawable); findViewById(R.id.Takeoff).setVisibility(View.INVISIBLE); - }else { - connectedDrawable = getResources().getDrawable(R.drawable.ic_lock_open_black_24dp,null); + } else { + connectedDrawable = getResources().getDrawable(R.drawable.ic_lock_open_black_24dp, null); mBtnSafety.setBackground(connectedDrawable); findViewById(R.id.Takeoff).setVisibility(View.VISIBLE); } @@ -604,51 +606,30 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y //-------------------------------------------------------------- } + // Start the AI Pluggin (Developed by the customers...) + protected boolean startActivity(String pluggin) { + + Intent intent = getPackageManager().getLaunchIntentForPackage(pluggin); + if (intent == null) { + // Bring user to the market or let them choose an app? + intent = new Intent(Intent.ACTION_VIEW); + intent.setData(Uri.parse("market://details?id=" + "com.example.remoteconfig3")); + } + if (intent != null) { + intent.putExtra("password", "thisisrosettadrone246546101"); + intent.putExtra("ip", "127.0.0.1"); + intent.putExtra("port", 4000); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(intent); + } + return true; + } + + // If AI button is pressed then start the AI Pluggin ... protected void SetMesasageBox(String msg) { Uri notification = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_ALARM); Ringtone r = RingtoneManager.getRingtone(getApplicationContext(), notification); - - Intent intent = new Intent(MainActivity.this, AiActivity.class); - startActivityForResult(intent, RESULT_SETTINGS); -/* - -// AlertDialog.Builder alertDialog2 = new AlertDialog.Builder(this, R.style.CustomDialog); - AlertDialog.Builder alertDialog2 = new AlertDialog.Builder(this); - alertDialog2.setIcon(R.mipmap.track_right); - alertDialog2.setTitle("AI Mavlink/Python function selector!"); - alertDialog2.setMessage(msg); - // alertDialog2.setBackgroundDrawableResource(android.R.color.transparent); - alertDialog2.setNegativeButton("Finding...", - (dialog, which) -> { - mModel.setAIfunction(3); - r.stop(); - dialog.cancel(); - }); - alertDialog2.setNeutralButton("Tracking...", - (dialog, which) -> { - mModel.setAIfunction(2); - r.stop(); - dialog.cancel(); - }); - alertDialog2.setPositiveButton ("Inspecting...", - (dialog, which) -> { - mModel.setAIfunction(1); - r.stop(); - dialog.cancel(); - }); - /// - alertDialog2.setPositiveButton("Cancel", - (dialog, which) -> { - mModel.setAIfunction(0); - r.stop(); - dialog.cancel(); - }); -/// - this.runOnUiThread(() -> { - r.play(); - alertDialog2.show(); - }); - */ + startActivity("com.example.remoteconfig3"); } // By default disable takeoff... @@ -673,14 +654,13 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y } } - private void notifyStatusChange() - { + private void notifyStatusChange() { mDJIHandler.removeCallbacks(djiUpdateRunnable); mDJIHandler.postDelayed(djiUpdateRunnable, 500); final BaseProduct product = RDApplication.getProductInstance(); if (product != null && product.isConnected() && product.getModel() != null) { - logMessageDJI(product.getModel().name() + " Connected " ); + logMessageDJI(product.getModel().name() + " Connected "); } else { logMessageDJI("Disconnected"); Log.e(TAG, "Video out 2: "); @@ -691,16 +671,19 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y // For newer drones... mReceivedVideoDataListener = (videoBuffer, size) -> { if (m_videoMode == 2) { - if(mCodecManager != null){ + if (mCodecManager != null && mProductModel != Model.MAVIC_PRO) { mCodecManager.sendDataToDecoder(videoBuffer, size); } // Send raw H264 to the FFMPEG parser... - if(mExternalVideoOut == true) - NativeHelper.getInstance().parse(videoBuffer, size,0); + if (mExternalVideoOut == true) { +// Log.e(TAG, "Video size:: "+size); + NativeHelper.getInstance().parse(videoBuffer, size, 0); + } } else { // Send H.264 to the NAIL generator... - if(mExternalVideoOut == true) - NativeHelper.getInstance().parse(videoBuffer, size,1); + if (mExternalVideoOut == true) { + NativeHelper.getInstance().parse(videoBuffer, size, 1); + } } }; @@ -708,14 +691,13 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y mCamera = null; } else { // List all models that needs alternative decoding... - if ( validateTranscodingMethod(product.getModel())==true) - { + if (validateTranscodingMethod(product.getModel()) == true) { m_videoMode = 2; } if (!product.getModel().equals(Model.UNKNOWN_AIRCRAFT)) { mCamera = product.getCamera(); - if(mCamera != null) { + if (mCamera != null) { mCamera.setMode(SettingsDefinitions.CameraMode.SHOOT_PHOTO, djiError -> { if (djiError != null) { Log.e(TAG, "can't change mode of camera, error: " + djiError.getDescription()); @@ -739,9 +721,8 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y standardVideoFeeder.addVideoDataListener(mReceivedVideoDataListener); logMessageDJI("Transcode Video !!!!!!!"); } - }else{ - VideoFeeder.getInstance().getPrimaryVideoFeed(); - if (mExternalVideoOut == true) { + } else { + if (mExternalVideoOut && VideoFeeder.getInstance().getPrimaryVideoFeed() != null) { VideoFeeder.getInstance().getPrimaryVideoFeed().addVideoDataListener(mReceivedVideoDataListener); logMessageDJI("Do NOT Transcode Video !!!!!!!"); } @@ -750,8 +731,7 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y } } - private boolean validateTranscodingMethod(Model model) - { + private boolean validateTranscodingMethod(Model model) { // If the drone requires the old handling... switch (model) { case UNKNOWN_HANDHELD: @@ -760,7 +740,10 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y case PHANTOM_3_ADVANCED: case PHANTOM_3_PROFESSIONAL: case Phantom_3_4K: + case MAVIC_MINI: + case MAVIC_PRO: case INSPIRE_1: + case Spark: case INSPIRE_1_PRO: case INSPIRE_1_RAW: // Verified... case MAVIC_AIR: // Verified... @@ -777,14 +760,14 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y * Init a fake texture view to for the codec manager, so that the video raw data can be received * by the camera needed to get video to the UDP handler... */ - // private void initPreviewerTextureView() { - // Log.e(TAG, "initPreviewerTextureView"); + // private void initPreviewerTextureView() { + // Log.e(TAG, "initPreviewerTextureView"); private TextureView.SurfaceTextureListener mSurfaceTextureListener = new TextureView.SurfaceTextureListener() { @Override public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) { Log.d(TAG, "real onSurfaceTextureAvailable: width " + width + " height " + height); - if(compare_height==1){ + if (compare_height == 1) { height = ((int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 86, getResources().getDisplayMetrics())); width = ((int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 164, getResources().getDisplayMetrics())); @@ -796,7 +779,7 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y videoViewWidth = width; videoViewHeight = height; - Log.d(TAG, "real onSurfaceTextureAvailable: width " + videoViewWidth + " height " + videoViewHeight+" Mode: "+compare_height); + Log.d(TAG, "real onSurfaceTextureAvailable: width " + videoViewWidth + " height " + videoViewHeight + " Mode: " + compare_height); if (mCodecManager == null) { mCodecManager = new DJICodecManager(getApplicationContext(), surface, width, height); } @@ -839,16 +822,16 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y private DJISDKManager.SDKManagerCallback mDJISDKManagerCallback = new DJISDKManager.SDKManagerCallback() { @Override - public void onDatabaseDownloadProgress(long x, long y){ + public void onDatabaseDownloadProgress(long x, long y) { } @Override - public void onInitProcess(DJISDKInitEvent a, int x){ + public void onInitProcess(DJISDKInitEvent a, int x) { } @Override public void onProductDisconnect() { - //notifyStatusChange(); + notifyStatusChange(); } @Override @@ -1125,11 +1108,11 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y case R.id.action_settings: onClickSettings(); break; - case R.id.action_help: - onClickHelp(); + case R.id.action_waypoint2: + onClickWaypoint1(); break; - case R.id.action_gaode: - onClickGaode(); + case R.id.action_waypoint1: + onClickWaypoint2(); break; case R.id.action_gui: onClickGUI(); @@ -1140,28 +1123,28 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y return true; } - public void onSmallMapClick(View v){ + public void onSmallMapClick(View v) { LinearLayout map_layout = findViewById(R.id.map_view); FrameLayout video_layout_small = findViewById(R.id.fragment_container_small); - ViewGroup.LayoutParams map_para = map_layout.getLayoutParams(); - if (compare_height==0){ + if (compare_height == 0) { logMessageDJI("Set Small screen..."); videostreamPreviewTtView.clearFocus(); videostreamPreviewTtView.setVisibility(View.GONE); - +/* if ( mCodecManager != null) { mCodecManager.cleanSurface(); mCodecManager.destroyCodec(); mCodecManager=null; } - - safeSleep(200); +*/ + // safeSleep(200); videostreamPreviewTtViewSmall.setSurfaceTextureListener(mSurfaceTextureListener); videostreamPreviewTtViewSmall.setVisibility(View.VISIBLE); - videostreamPreviewTtViewSmall.requestFocus(); // .buildLayer(); +// videostreamPreviewTtViewSmall.setAlpha((float)0.4); + // videostreamPreviewTtViewSmall.requestFocus(); // .buildLayer(); // videostreamPreviewTtView.clearFocus(); // /* @@ -1172,7 +1155,6 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y videostreamPreviewTtViewSmall.setSurfaceTextureListener(mSurfaceTextureListener); videostreamPreviewTtViewSmall.setVisibility(View.VISIBLE); */ - video_layout_small.setZ(100.f); map_layout.setZ(0.f); @@ -1181,30 +1163,31 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y map_layout.setLayoutParams(map_para); compare_height = 1; - }else{ + } else { logMessageDJI("Set Main screen..."); videostreamPreviewTtViewSmall.clearFocus(); videostreamPreviewTtViewSmall.setVisibility(View.GONE); - +/* if ( mCodecManager != null) { mCodecManager.cleanSurface(); mCodecManager.destroyCodec(); mCodecManager = null; } - - safeSleep(200); +*/ + // safeSleep(200); videostreamPreviewTtView.setSurfaceTextureListener(mSurfaceTextureListener); - videostreamPreviewTtView.buildLayer(); + // videostreamPreviewTtView.buildLayer(); videostreamPreviewTtView.setVisibility(View.VISIBLE); - videostreamPreviewTtView.requestFocus(); // .buildLayer(); + // videostreamPreviewTtView.requestFocus(); + // videostreamPreviewTtViewSmall.setAlpha((float)0.4); - // videostreamPreviewTtViewSmall.setSurfaceTextureListener(mSurfaceTextureListener); - // mSurfaceTextureListener.onSurfaceTextureAvailable(surfaceT, videoViewWidth, videoViewHeight); - // videostreamPreviewTtView.setVisibility(View.VISIBLE); + // videostreamPreviewTtViewSmall.setSurfaceTextureListener(mSurfaceTextureListener); + // mSurfaceTextureListener.onSurfaceTextureAvailable(surfaceT, videoViewWidth, videoViewHeight); + // videostreamPreviewTtView.setVisibility(View.VISIBLE); - // videostreamPreviewTtView.setSurfaceTextureListener(mSurfaceTextureListener); - // videostreamPreviewTtViewSmall.clearFocus(); // + // videostreamPreviewTtView.setSurfaceTextureListener(mSurfaceTextureListener); + // videostreamPreviewTtViewSmall.clearFocus(); // video_layout_small.setZ(0.f); @@ -1216,6 +1199,8 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y map_layout.setBottom(((int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, getResources().getDisplayMetrics()))); map_layout.setLeft(((int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 5, getResources().getDisplayMetrics()))); +// com.amap.api.maps.MapView map = findViewById(R.id.map); +// map.setAlpha((float)0.99); compare_height = 0; } @@ -1228,7 +1213,7 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y @Override public boolean onContextItemSelected(MenuItem item) { // AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) item.getMenuInfo(); - logMessageDJI("Config ..."+item); + logMessageDJI("Config ..." + item); switch (item.getItemId()) { case R.id.action_clear_logs: onClickClearLogs(); @@ -1239,11 +1224,11 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y case R.id.action_settings: onClickSettings(); break; - case R.id.action_help: - onClickHelp(); + case R.id.action_waypoint2: + onClickWaypoint1(); break; - case R.id.action_gaode: - onClickGaode(); + case R.id.action_waypoint1: + onClickWaypoint2(); break; case R.id.action_gui: onClickGUI(); @@ -1259,25 +1244,24 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y startActivityForResult(intent, RESULT_SETTINGS); } - private void onClickHelp() { - Intent intent = new Intent(MainActivity.this, MapActivity.class); + private void onClickWaypoint1() { + Intent intent = new Intent(MainActivity.this, Waypoint1Activity.class); startActivityForResult(intent, RESULT_HELP); } - private void onClickGaode() { - Intent intent = new Intent(MainActivity.this, GaodeActivity.class); + private void onClickWaypoint2() { + Intent intent = new Intent(MainActivity.this, Waypoint2Activity.class); startActivityForResult(intent, RESULT_HELP); } private void onClickGUI() { - if(!gui_enabled){ + if (!gui_enabled) { gui_enabled = true; logDJI.clearLogText(); logOutbound.clearLogText(); logInbound.clearLogText(); - } - else{ + } else { gui_enabled = false; } } @@ -1331,7 +1315,7 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y sendDroneConnected(); - final Drawable connectedDrawable = getResources().getDrawable(R.drawable.ic_baseline_connected_24px,null); + final Drawable connectedDrawable = getResources().getDrawable(R.drawable.ic_baseline_connected_24px, null); runOnUiThread(() -> { ImageView djiImageView = findViewById(R.id.dji_conn); @@ -1342,7 +1326,7 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y } private void onDroneDisconnected() { - final Drawable disconnectedDrawable = getResources().getDrawable(R.drawable.ic_outline_disconnected_24px,null); + final Drawable disconnectedDrawable = getResources().getDrawable(R.drawable.ic_outline_disconnected_24px, null); runOnUiThread(() -> { ImageView imageView = findViewById(R.id.dji_conn); @@ -1405,7 +1389,7 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y } public void logMessageDJI(String msg) { - if(mNewDJI.length() > 1000) + if (mNewDJI.length() > 1000) mNewDJI = mNewDJI.substring(500, 1000); mNewDJI += "\n" + msg; @@ -1546,12 +1530,6 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y Log.e(TAG, "onPointerCaptureChanged"); } - @Override - public void onYuvDataReceived(MediaFormat mediaFormat, ByteBuffer byteBuffer, int i, int i1, int i2) { - Log.e(TAG, "onYuvDataReceived"); - - } - //region GCS Timer Task //--------------------------------------------------------------------------------------- @@ -1629,7 +1607,7 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y if (mainActivityWeakReference.get().connectivityHasChanged) { if (mainActivityWeakReference.get().shouldConnect) { - final Drawable connectedDrawable = mainActivityWeakReference.get().getResources().getDrawable(R.drawable.ic_baseline_connected_24px,null); + final Drawable connectedDrawable = mainActivityWeakReference.get().getResources().getDrawable(R.drawable.ic_baseline_connected_24px, null); mainActivityWeakReference.get().runOnUiThread(() -> { ImageView imageView = mainActivityWeakReference.get().findViewById(R.id.gcs_conn); @@ -1637,7 +1615,7 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y imageView.invalidate(); }); } else { - final Drawable disconnectedDrawable = mainActivityWeakReference.get().getResources().getDrawable(R.drawable.ic_outline_disconnected_24px,null); + final Drawable disconnectedDrawable = mainActivityWeakReference.get().getResources().getDrawable(R.drawable.ic_outline_disconnected_24px, null); mainActivityWeakReference.get().runOnUiThread(() -> { ImageView imageView = mainActivityWeakReference.get().findViewById(R.id.gcs_conn); @@ -1706,7 +1684,7 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y close(); - final Drawable disconnectedDrawable = mainActivityWeakReference.get().getResources().getDrawable(R.drawable.ic_outline_disconnected_24px,null); + final Drawable disconnectedDrawable = mainActivityWeakReference.get().getResources().getDrawable(R.drawable.ic_outline_disconnected_24px, null); mainActivityWeakReference.get().runOnUiThread(() -> { ImageView imageView = mainActivityWeakReference.get().findViewById(R.id.gcs_conn); @@ -1791,11 +1769,15 @@ public class MainActivity extends AppCompatActivity implements DJICodecManager.Y // To be moved later for better structure.... private boolean isTranscodedVideoFeedNeeded() { + // I do not like this, but is seems to work... + if( mProductModel == Model.MAVIC_PRO ) + return true; + if (VideoFeeder.getInstance() == null) { return false; } boolean TranscodeNeeded = VideoFeeder.getInstance().isFetchKeyFrameNeeded() || VideoFeeder.getInstance() - .isLensDistortionCalibrationNeeded(); + .isLensDistortionCalibrationNeeded(); return TranscodeNeeded; } diff --git a/app/src/main/java/sq/rogue/rosettadrone/MiniPID.java b/app/src/main/java/sq/rogue/rosettadrone/MiniPID.java index ce79979..dd06844 100644 --- a/app/src/main/java/sq/rogue/rosettadrone/MiniPID.java +++ b/app/src/main/java/sq/rogue/rosettadrone/MiniPID.java @@ -1,44 +1,46 @@ package sq.rogue.rosettadrone; + /** * Small, easy to use PID implementation with advanced controller capability.
* Minimal usage:
* MiniPID pid = new MiniPID(p,i,d);
* ...looping code...{
- * output= pid.getOutput(sensorvalue,target);
+ * output= pid.getOutput(sensorvalue,target);
* } + * * @see https://github.com/tekdemo/MiniPID-Java * @see http://brettbeauregard.com/blog/2011/04/improving-the-beginners-pid-direction/improving-the-beginners-pid-introduction */ -public class MiniPID{ +public class MiniPID { //********************************** // Class private variables //********************************** - private double P=0; - private double I=0; - private double D=0; - private double F=0; + private double P = 0; + private double I = 0; + private double D = 0; + private double F = 0; - private double maxIOutput=0; - private double maxError=0; - private double errorSum=0; + private double maxIOutput = 0; + private double maxError = 0; + private double errorSum = 0; - private double maxOutput=0; - private double minOutput=0; + private double maxOutput = 0; + private double minOutput = 0; - private double setpoint=0; + private double setpoint = 0; - private double lastActual=0; + private double lastActual = 0; - private boolean firstRun=true; - private boolean reversed=false; + private boolean firstRun = true; + private boolean reversed = false; - private double outputRampRate=0; - private double lastOutput=0; + private double outputRampRate = 0; + private double lastOutput = 0; - private double outputFilter=0; + private double outputFilter = 0; - private double setpointRange=0; + private double setpointRange = 0; //********************************** // Constructor functions @@ -47,31 +49,39 @@ public class MiniPID{ /** * Create a MiniPID class object. * See setP, setI, setD methods for more detailed parameters. + * * @param p Proportional gain. Large if large difference between setpoint and target. * @param i Integral gain. Becomes large if setpoint cannot reach target quickly. * @param d Derivative gain. Responds quickly to large changes in error. Small values prevents P and I terms from causing overshoot. */ - public MiniPID(double p, double i, double d){ - P=p; I=i; D=d; + public MiniPID(double p, double i, double d) { + P = p; + I = i; + D = d; checkSigns(); } /** * Create a MiniPID class object. * See setP, setI, setD, setF methods for more detailed parameters. + * * @param p Proportional gain. Large if large difference between setpoint and target. * @param i Integral gain. Becomes large if setpoint cannot reach target quickly. * @param d Derivative gain. Responds quickly to large changes in error. Small values prevents P and I terms from causing overshoot. * @param f Feed-forward gain. Open loop "best guess" for the output should be. Only useful if setpoint represents a rate. */ - public MiniPID(double p, double i, double d, double f){ - P=p; I=i; D=d; F=f; + public MiniPID(double p, double i, double d, double f) { + P = p; + I = i; + D = d; + F = f; checkSigns(); } //********************************** // Configuration functions //********************************** + /** * Configure the Proportional gain parameter.
* This responds quickly to changes in setpoint, and provides most of the initial driving force @@ -82,8 +92,8 @@ public class MiniPID{ * * @param p Proportional gain. Affects output according to output+=P*(setpoint-current_value) */ - public void setP(double p){ - P=p; + public void setP(double p) { + P = p; checkSigns(); } @@ -93,18 +103,17 @@ public class MiniPID{ * Typically tuned second for "Position" based modes, and third for "Rate" or continuous based modes.
* Affects output through output+=previous_errors*Igain ;previous_errors+=current_error * - * @see {@link #setMaxIOutput(double) setMaxIOutput} for how to restrict - * * @param i New gain value for the Integral term + * @see {@link #setMaxIOutput(double) setMaxIOutput} for how to restrict */ - public void setI(double i){ - if(I!=0){ - errorSum=errorSum*I/i; + public void setI(double i) { + if (I != 0) { + errorSum = errorSum * I / i; } - if(maxIOutput!=0){ - maxError=maxIOutput/i; + if (maxIOutput != 0) { + maxError = maxIOutput / i; } - I=i; + I = i; checkSigns(); // Implementation note: // This Scales the accumulated error to avoid output errors. @@ -127,8 +136,8 @@ public class MiniPID{ * * @param d New gain value for the Derivative term */ - public void setD(double d){ - D=d; + public void setD(double d) { + D = d; checkSigns(); } @@ -141,20 +150,22 @@ public class MiniPID{ * * @param f Feed forward gain. */ - public void setF(double f){ - F=f; + public void setF(double f) { + F = f; checkSigns(); } /** * Configure the PID object. * See setP, setI, setD methods for more detailed parameters. + * * @param p Proportional gain. Large if large difference between setpoint and target. * @param i Integral gain. Becomes large if setpoint cannot reach target quickly. * @param d Derivative gain. Responds quickly to large changes in error. Small values prevents P and I terms from causing overshoot. */ - public void setPID(double p, double i, double d){ - P=p;D=d; + public void setPID(double p, double i, double d) { + P = p; + D = d; //Note: the I term has additional calculations, so we need to use it's //specific method for setting it. setI(i); @@ -164,13 +175,16 @@ public class MiniPID{ /** * Configure the PID object. * See setP, setI, setD, setF methods for more detailed parameters. + * * @param p Proportional gain. Large if large difference between setpoint and target. * @param i Integral gain. Becomes large if setpoint cannot reach target quickly. * @param d Derivative gain. Responds quickly to large changes in error. Small values prevents P and I terms from causing overshoot. * @param f Feed-forward gain. Open loop "best guess" for the output should be. Only useful if setpoint represents a rate. */ - public void setPID(double p, double i, double d,double f){ - P=p;D=d;F=f; + public void setPID(double p, double i, double d, double f) { + P = p; + D = d; + F = f; //Note: the I term has additional calculations, so we need to use it's //specific method for setting it. setI(i); @@ -180,15 +194,16 @@ public class MiniPID{ /** * Set the maximum output value contributed by the I component of the system * This can be used to prevent large windup issues and make tuning simpler + * * @param maximum. Units are the same as the expected output value */ - public void setMaxIOutput(double maximum){ + public void setMaxIOutput(double maximum) { // Internally maxError and Izone are similar, but scaled for different purposes. // The maxError is generated for simplifying math, since calculations against // the max error are far more common than changing the I term or Izone. - maxIOutput=maximum; - if(I!=0){ - maxError=maxIOutput/I; + maxIOutput = maximum; + if (I != 0) { + maxError = maxIOutput / I; } } @@ -196,36 +211,39 @@ public class MiniPID{ * Specify a maximum output range.
* When one input is specified, output range is configured to * [-output, output] + * * @param output */ - public void setOutputLimits(double output){ - setOutputLimits(-output,output); + public void setOutputLimits(double output) { + setOutputLimits(-output, output); } /** * Specify a maximum output. * When two inputs specified, output range is configured to * [minimum, maximum] + * * @param minimum possible output value * @param maximum possible output value */ - public void setOutputLimits(double minimum,double maximum){ - if(maximum(maximum-minimum) ){ - setMaxIOutput(maximum-minimum); + if (maxIOutput == 0 || maxIOutput > (maximum - minimum)) { + setMaxIOutput(maximum - minimum); } } /** * Set the operating direction of the PID controller + * * @param reversed Set true to reverse PID output */ - public void setDirection(boolean reversed){ - this.reversed=reversed; + public void setDirection(boolean reversed) { + this.reversed = reversed; } //********************************** @@ -236,98 +254,97 @@ public class MiniPID{ * Configure setpoint for the PID calculations
* This represents the target for the PID system's, such as a * position, velocity, or angle.
- * @see MiniPID#getOutput(actual)
+ * * @param setpoint + * @see MiniPID#getOutput(actual)
*/ - public void setSetpoint(double setpoint){ - this.setpoint=setpoint; + public void setSetpoint(double setpoint) { + this.setpoint = setpoint; } /** * Calculate the output value for the current PID cycle.
- * @param actual The monitored value, typically as a sensor input. + * + * @param actual The monitored value, typically as a sensor input. * @param setpoint The target value for the system * @return calculated output value for driving the system */ - public double getOutput(double actual, double setpoint){ + public double getOutput(double actual, double setpoint) { double output; double Poutput; double Ioutput; double Doutput; double Foutput; - this.setpoint=setpoint; + this.setpoint = setpoint; // Ramp the setpoint used for calculations if user has opted to do so - if(setpointRange!=0){ - setpoint=constrain(setpoint,actual-setpointRange,actual+setpointRange); + if (setpointRange != 0) { + setpoint = constrain(setpoint, actual - setpointRange, actual + setpointRange); } // Do the simple parts of the calculations - double error=setpoint-actual; + double error = setpoint - actual; // Calculate F output. Notice, this depends only on the setpoint, and not the error. - Foutput=F*setpoint; + Foutput = F * setpoint; // Calculate P term - Poutput=P*error; + Poutput = P * error; // If this is our first time running this, we don't actually _have_ a previous input or output. // For sensor, sanely assume it was exactly where it is now. // For last output, we can assume it's the current time-independent outputs. - if(firstRun){ - lastActual=actual; - lastOutput=Poutput+Foutput; - firstRun=false; + if (firstRun) { + lastActual = actual; + lastOutput = Poutput + Foutput; + firstRun = false; } // Calculate D Term // Note, this is negative. This actually "slows" the system if it's doing // the correct thing, and small values helps prevent output spikes and overshoot - Doutput= -D*(actual-lastActual); - lastActual=actual; + Doutput = -D * (actual - lastActual); + lastActual = actual; // The Iterm is more complex. There's several things to factor in to make it easier to deal with. // 1. maxIoutput restricts the amount of output contributed by the Iterm. // 2. prevent windup by not increasing errorSum if we're already running against our max Ioutput // 3. prevent windup by not increasing errorSum if output is output=maxOutput - Ioutput=I*errorSum; - if(maxIOutput!=0){ - Ioutput=constrain(Ioutput,-maxIOutput,maxIOutput); + Ioutput = I * errorSum; + if (maxIOutput != 0) { + Ioutput = constrain(Ioutput, -maxIOutput, maxIOutput); } // And, finally, we can just add the terms up - output=Foutput + Poutput + Ioutput + Doutput; + output = Foutput + Poutput + Ioutput + Doutput; // Figure out what we're doing with the error. - if(minOutput!=maxOutput && !bounded(output, minOutput,maxOutput) ){ - errorSum=error; + if (minOutput != maxOutput && !bounded(output, minOutput, maxOutput)) { + errorSum = error; // reset the error sum to a sane level // Setting to current error ensures a smooth transition when the P term // decreases enough for the I term to start acting upon the controller // From that point the I term will build up as would be expected - } - else if(outputRampRate!=0 && !bounded(output, lastOutput-outputRampRate,lastOutput+outputRampRate) ){ - errorSum=error; - } - else if(maxIOutput!=0){ - errorSum=constrain(errorSum+error,-maxError,maxError); + } else if (outputRampRate != 0 && !bounded(output, lastOutput - outputRampRate, lastOutput + outputRampRate)) { + errorSum = error; + } else if (maxIOutput != 0) { + errorSum = constrain(errorSum + error, -maxError, maxError); // In addition to output limiting directly, we also want to prevent I term // buildup, so restrict the error directly - } - else{ - errorSum+=error; + } else { + errorSum += error; } // Restrict output to our specified output and ramp limits - if(outputRampRate!=0){ - output=constrain(output, lastOutput-outputRampRate,lastOutput+outputRampRate); + if (outputRampRate != 0) { + output = constrain(output, lastOutput - outputRampRate, lastOutput + outputRampRate); } - if(minOutput!=maxOutput){ - output=constrain(output, minOutput,maxOutput); + if (minOutput != maxOutput) { + output = constrain(output, minOutput, maxOutput); } - if(outputFilter!=0){ - output=lastOutput*outputFilter+output*(1-outputFilter); + if (outputFilter != 0) { + output = lastOutput * outputFilter + output * (1 - outputFilter); } // Get a test printline with lots of details about the internal @@ -335,7 +352,7 @@ public class MiniPID{ // System.out.printf("Final output %5.2f [ %5.2f, %5.2f , %5.2f ], eSum %.2f\n",output,Poutput, Ioutput, Doutput,errorSum ); // System.out.printf("%5.2f\t%5.2f\t%5.2f\t%5.2f\n",output,Poutput, Ioutput, Doutput ); - lastOutput=output; + lastOutput = output; return output; } @@ -344,22 +361,24 @@ public class MiniPID{ * In no-parameter mode, this uses the last sensor value, * and last setpoint value.
* Not typically useful, and use of parameter modes is suggested.
+ * * @return calculated output value for driving the system */ - public double getOutput(){ - return getOutput(lastActual,setpoint); + public double getOutput() { + return getOutput(lastActual, setpoint); } /** * Calculate the output value for the current PID cycle.
* In one parameter mode, the last configured setpoint will be used.
- * @see MiniPID#setSetpoint() - * @param actual The monitored value, typically as a sensor input. + * + * @param actual The monitored value, typically as a sensor input. * @param setpoint The target value for the system * @return calculated output value for driving the system + * @see MiniPID#setSetpoint() */ - public double getOutput(double actual){ - return getOutput(actual,setpoint); + public double getOutput(double actual) { + return getOutput(actual, setpoint); } /** @@ -369,9 +388,9 @@ public class MiniPID{ * duration, and the controlled portion of the system may have changed due to * external forces. */ - public void reset(){ - firstRun=true; - errorSum=0; + public void reset() { + firstRun = true; + errorSum = 0; } /** @@ -384,8 +403,8 @@ public class MiniPID{ * * @param rate, with units being the same as the output */ - public void setOutputRampRate(double rate){ - outputRampRate=rate; + public void setOutputRampRate(double rate) { + outputRampRate = rate; } /** @@ -393,10 +412,11 @@ public class MiniPID{ *
Can simplify tuning by helping tuning over a small range applies to a much larger range. *
This limits the reactivity of P term, and restricts impact of large D term * during large setpoint adjustments. Increases lag and I term if range is too small. + * * @param range, with units being the same as the expected sensor range. */ - public void setSetpointRange(double range){ - setpointRange=range; + public void setSetpointRange(double range) { + setpointRange = range; } /** @@ -408,11 +428,12 @@ public class MiniPID{ * values and increase I term overshoot.
* Uses an exponential wieghted rolling sum filter, according to a simple
* 

output*(1-strength)*sum(0..n){output*strength^n}
algorithm. + * * @param output valid between [0..1), meaning [current output only.. historical output only) */ - public void setOutputFilter(double strength){ - if(strength==0 || bounded(strength,0,1)){ - outputFilter=strength; + public void setOutputFilter(double strength) { + if (strength == 0 || bounded(strength, 0, 1)) { + outputFilter = strength; } } @@ -422,48 +443,53 @@ public class MiniPID{ /** * Forces a value into a specific range + * * @param value input value - * @param min maximum returned value - * @param max minimum value in range + * @param min maximum returned value + * @param max minimum value in range * @return Value if it's within provided range, min or max otherwise */ - private double constrain(double value, double min, double max){ - if(value > max){ return max;} - if(value < min){ return min;} + private double constrain(double value, double min, double max) { + if (value > max) { + return max; + } + if (value < min) { + return min; + } return value; } /** * Test if the value is within the min and max, inclusive + * * @param value to test - * @param min Minimum value of range - * @param max Maximum value of range + * @param min Minimum value of range + * @param max Maximum value of range * @return true if value is within range, false otherwise */ - private boolean bounded(double value, double min, double max){ + private boolean bounded(double value, double min, double max) { // Note, this is an inclusive range. This is so tests like // `bounded(constrain(0,0,1),0,1)` will return false. // This is more helpful for determining edge-case behaviour // than <= is. - return (min0) P*=-1; - if(I>0) I*=-1; - if(D>0) D*=-1; - if(F>0) F*=-1; - } - else{ // all values should be above zero - if(P<0) P*=-1; - if(I<0) I*=-1; - if(D<0) D*=-1; - if(F<0) F*=-1; + private void checkSigns() { + if (reversed) { // all values should be below zero + if (P > 0) P *= -1; + if (I > 0) I *= -1; + if (D > 0) D *= -1; + if (F > 0) F *= -1; + } else { // all values should be above zero + if (P < 0) P *= -1; + if (I < 0) I *= -1; + if (D < 0) D *= -1; + if (F < 0) F *= -1; } } } \ No newline at end of file diff --git a/app/src/main/java/sq/rogue/rosettadrone/NotificationHandler.java b/app/src/main/java/sq/rogue/rosettadrone/NotificationHandler.java index 449af9d..b75fe17 100644 --- a/app/src/main/java/sq/rogue/rosettadrone/NotificationHandler.java +++ b/app/src/main/java/sq/rogue/rosettadrone/NotificationHandler.java @@ -2,10 +2,12 @@ package sq.rogue.rosettadrone; import android.content.Context; import android.content.DialogInterface; -import com.google.android.material.snackbar.Snackbar; -import androidx.appcompat.app.AlertDialog; import android.view.View; +import com.google.android.material.snackbar.Snackbar; + +import androidx.appcompat.app.AlertDialog; + import static sq.rogue.rosettadrone.util.TYPE_DRONE_ID; import static sq.rogue.rosettadrone.util.TYPE_DRONE_RTL_ALTITUDE; import static sq.rogue.rosettadrone.util.TYPE_FLIGHT_PATH_RADIUS; diff --git a/app/src/main/java/sq/rogue/rosettadrone/RDApplication.java b/app/src/main/java/sq/rogue/rosettadrone/RDApplication.java index 56189dc..1f4f784 100644 --- a/app/src/main/java/sq/rogue/rosettadrone/RDApplication.java +++ b/app/src/main/java/sq/rogue/rosettadrone/RDApplication.java @@ -2,33 +2,33 @@ package sq.rogue.rosettadrone; import android.app.Application; import android.content.Context; -import android.media.Ringtone; import com.secneo.sdk.Helper; - import dji.sdk.base.BaseProduct; import dji.sdk.sdkmanager.DJISDKManager; public class RDApplication extends Application { + public static final String FLAG_CONNECTION_CHANGE = "dji_sdk_connection_change"; private static BaseProduct mProduct; private static DJISimulatorApplication simulatorApplication; private static boolean m_sim = false; // True if simulate... - public static boolean getSim(){ + public static boolean getSim() { return m_sim; } - public static void setSim(boolean sim){ + + public static void setSim(boolean sim) { m_sim = sim; } public static synchronized BaseProduct getProductInstance() { if (null == mProduct) { - if( getSim() == false) { + if (getSim() == false) { mProduct = DJISDKManager.getInstance().getProduct(); - }else { + } else { mProduct = simulatorApplication.getProductInstance(); } } diff --git a/app/src/main/java/sq/rogue/rosettadrone/RosettaMissionOperatorListener.java b/app/src/main/java/sq/rogue/rosettadrone/RosettaMissionOperatorListener.java index 2011990..b04d7db 100644 --- a/app/src/main/java/sq/rogue/rosettadrone/RosettaMissionOperatorListener.java +++ b/app/src/main/java/sq/rogue/rosettadrone/RosettaMissionOperatorListener.java @@ -1,10 +1,10 @@ package sq.rogue.rosettadrone; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.util.Log; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import dji.common.error.DJIError; import dji.common.mission.waypoint.WaypointMissionDownloadEvent; import dji.common.mission.waypoint.WaypointMissionExecutionEvent; diff --git a/app/src/main/java/sq/rogue/rosettadrone/TimeLineMissionControlView.java b/app/src/main/java/sq/rogue/rosettadrone/TimeLineMissionControlView.java index a4282a4..b9493eb 100644 --- a/app/src/main/java/sq/rogue/rosettadrone/TimeLineMissionControlView.java +++ b/app/src/main/java/sq/rogue/rosettadrone/TimeLineMissionControlView.java @@ -3,12 +3,11 @@ package sq.rogue.rosettadrone; import android.util.Log; import android.widget.TextView; -import androidx.annotation.Nullable; - import java.util.ArrayList; import java.util.LinkedList; import java.util.List; +import androidx.annotation.Nullable; import dji.common.error.DJIError; import dji.common.gimbal.Attitude; import dji.common.gimbal.Rotation; @@ -30,26 +29,22 @@ import dji.sdk.mission.Triggerable; import dji.sdk.mission.timeline.TimelineElement; import dji.sdk.mission.timeline.TimelineEvent; import dji.sdk.mission.timeline.TimelineMission; -import dji.sdk.mission.timeline.actions.AircraftYawAction; import dji.sdk.mission.timeline.actions.GimbalAttitudeAction; import dji.sdk.mission.timeline.actions.GoHomeAction; import dji.sdk.mission.timeline.actions.GoToAction; import dji.sdk.mission.timeline.actions.HotpointAction; -import dji.sdk.mission.timeline.actions.RecordVideoAction; -import dji.sdk.mission.timeline.actions.ShootPhotoAction; import dji.sdk.mission.timeline.actions.TakeOffAction; import dji.sdk.mission.timeline.triggers.AircraftLandedTrigger; import dji.sdk.mission.timeline.triggers.BatteryPowerLevelTrigger; import dji.sdk.mission.timeline.triggers.Trigger; import dji.sdk.mission.timeline.triggers.TriggerEvent; import dji.sdk.mission.timeline.triggers.WaypointReachedTrigger; - import sq.rogue.rosettadrone.settings.GeneralUtils; /** * Class for Timeline MissionControl. */ -public class TimeLineMissionControlView { +public class TimeLineMissionControlView { private final String TAG = TimeLineMissionControlView.class.getSimpleName(); @@ -67,11 +62,11 @@ public class TimeLineMissionControlView { private void setRunningResultToText(final String s) { - Log.d(TAG,s); + Log.d(TAG, s); } private void setTimelinePlanToText(final String s) { - Log.d(TAG,s); + Log.d(TAG, s); } /** @@ -104,6 +99,7 @@ public class TimeLineMissionControlView { /** * Demo on AircraftLandedTrigger. Once the aircraft is landed, this trigger action will be called if the timeline is * not finished yet. + * * @param triggerTarget */ private void addAircraftLandedTrigger(Triggerable triggerTarget) { @@ -114,7 +110,7 @@ public class TimeLineMissionControlView { private Trigger.Listener triggerListener = new Trigger.Listener() { @Override public void onEvent(Trigger trigger, TriggerEvent event, @Nullable DJIError error) { - setRunningResultToText("Trigger " + trigger.getClass().getSimpleName() + " event is " + event.name() + (error==null? " ":error.getDescription())); + setRunningResultToText("Trigger " + trigger.getClass().getSimpleName() + " event is " + event.name() + (error == null ? " " : error.getDescription())); } }; @@ -149,10 +145,10 @@ public class TimeLineMissionControlView { + additionalComment); } } - void initTimeline() - { + + void initTimeline() { if (!GeneralUtils.checkGpsCoordinate(homeLatitude, homeLongitude)) { - Log.d(TAG,"No home point!!!"); + Log.d(TAG, "No home point!!!"); return; } @@ -168,7 +164,7 @@ public class TimeLineMissionControlView { //Step 2: reset the gimbal to horizontal angle in 2 seconds. setTimelinePlanToText("Step 2: set the gimbal pitch -30 angle in 2 seconds"); - Attitude attitude = new Attitude(20, Rotation.NO_ROTATION, Rotation.NO_ROTATION); + Attitude attitude = new Attitude(20, Rotation.NO_ROTATION, Rotation.NO_ROTATION); GimbalAttitudeAction gimbalAction = new GimbalAttitudeAction(attitude); gimbalAction.setCompletionTime(2); elements.add(gimbalAction); @@ -242,8 +238,7 @@ public class TimeLineMissionControlView { } // Takeoff and climbe to "alt" located at "lat,lon" rotating "yaw" degrees relative... - void TimeLinetakeOff(double lat, double lon, int alt, float yaw) - { + void TimeLinetakeOff(double lat, double lon, float alt, float yaw) { List elements = new ArrayList<>(); missionControl = MissionControl.getInstance(); @@ -253,21 +248,9 @@ public class TimeLineMissionControlView { setTimelinePlanToText("Step 1: takeoff from the ground"); elements.add(new TakeOffAction()); - setTimelinePlanToText("Step 2: rotate 90 deg"); - elements.add(new AircraftYawAction(yaw, 25)); - - setTimelinePlanToText("Step 3: climb x meters from home point"); - GoToAction lift = new GoToAction(new LocationCoordinate2D(lat,lon), alt); - lift.setFlightSpeed((float)1.0); // Slow down... - elements.add(lift); - - setTimelinePlanToText("Step 4: set the gimbal pitch -30 angle in 2 seconds"); - Attitude attitude = new Attitude(-30, Rotation.NO_ROTATION, Rotation.NO_ROTATION); - GimbalAttitudeAction gimbalAction = new GimbalAttitudeAction(attitude); - gimbalAction.setCompletionTime(2); - elements.add(gimbalAction); - - addBatteryPowerLevelTrigger(missionControl); + setTimelinePlanToText("Step 2: climb x meters from home point"); + setTimelinePlanToText("Lat: " + lat + " Lon: " + lon + " Alt: " + alt); + elements.add(new GoToAction(new LocationCoordinate2D(lat, lon), alt / (float) 1000.0)); if (missionControl.scheduledCount() > 0) { missionControl.unscheduleEverything(); @@ -277,9 +260,9 @@ public class TimeLineMissionControlView { missionControl.scheduleElements(elements); missionControl.addListener(listener); } + // Takeoff and climbe to "alt" located at "lat,lon" rotating "yaw" degrees relative... - void TimeLineGoTo(double lat, double lon, int alt, float speed, float yaw) - { + void TimeLineGoTo(double lat, double lon, float alt, float speed, float yaw) { List elements = new ArrayList<>(); missionControl = MissionControl.getInstance(); @@ -287,11 +270,8 @@ public class TimeLineMissionControlView { MissionControl.Listener listener = (element, event, error) -> updateTimelineStatus(element, event, error); setTimelinePlanToText("Step 1: takeoff from the ground"); - GoToAction lift = new GoToAction(new LocationCoordinate2D(lat,lon), alt); - lift.setFlightSpeed((float)speed); // Slow down... - elements.add(lift); - - addBatteryPowerLevelTrigger(missionControl); + setTimelinePlanToText("Lat: " + lat + " Lon: " + lon + " Alt: " + alt); + elements.add(new GoToAction(new LocationCoordinate2D(lat, lon), alt / (float) 1000.0)); if (missionControl.scheduledCount() > 0) { missionControl.unscheduleEverything(); @@ -327,6 +307,10 @@ public class TimeLineMissionControlView { ? "" : "Failed:" + error.getDescription())); + + if (event.toString() == "FINISHED") { + + } } preEvent = event; @@ -336,7 +320,7 @@ public class TimeLineMissionControlView { private WaypointMission initTestingWaypointMission() { if (!GeneralUtils.checkGpsCoordinate(homeLatitude, homeLongitude)) { - Log.d(TAG,"No home point!!!"); + Log.d(TAG, "No home point!!!"); return null; } @@ -348,13 +332,14 @@ public class TimeLineMissionControlView { .flightPathMode(WaypointMissionFlightPathMode.NORMAL) .gotoFirstWaypointMode(WaypointMissionGotoWaypointMode.SAFELY) .headingMode(WaypointMissionHeadingMode.AUTO) - .repeatTimes(1);; + .repeatTimes(1); + ; List waypoints = new LinkedList<>(); Waypoint northPoint = new Waypoint(homeLatitude + 10 * GeneralUtils.ONE_METER_OFFSET, homeLongitude, 10f); - Waypoint eastPoint = new Waypoint(homeLatitude, homeLongitude + 10 * GeneralUtils.calcLongitudeOffset(homeLatitude), 15f); + Waypoint eastPoint = new Waypoint(homeLatitude, homeLongitude + 10 * GeneralUtils.calcLongitudeOffset(homeLatitude), 15f); Waypoint southPoint = new Waypoint(homeLatitude - 10 * GeneralUtils.ONE_METER_OFFSET, homeLongitude, 10f); - Waypoint westPoint = new Waypoint(homeLatitude, homeLongitude - 10 * GeneralUtils.calcLongitudeOffset(homeLatitude), 15f); + Waypoint westPoint = new Waypoint(homeLatitude, homeLongitude - 10 * GeneralUtils.calcLongitudeOffset(homeLatitude), 15f); // northPoint.addAction(new WaypointAction(WaypointActionType.RESET_GIMBAL_YAW, 0)); northPoint.addAction(new WaypointAction(WaypointActionType.GIMBAL_PITCH, -60)); @@ -373,7 +358,7 @@ public class TimeLineMissionControlView { if (MissionControl.getInstance().scheduledCount() > 0) { MissionControl.getInstance().startTimeline(); } else { - Log.d(TAG,"Wait for takeoff..."); + Log.d(TAG, "Wait for takeoff..."); } } @@ -400,8 +385,7 @@ public class TimeLineMissionControlView { } - void addHome(double lat, double lon) - { + void addHome(double lat, double lon) { homeLatitude = lat; homeLongitude = lon; diff --git a/app/src/main/java/sq/rogue/rosettadrone/fragment/actuator/AircraftActuatorFragment.java b/app/src/main/java/sq/rogue/rosettadrone/fragment/actuator/AircraftActuatorFragment.java new file mode 100644 index 0000000..9ce27c3 --- /dev/null +++ b/app/src/main/java/sq/rogue/rosettadrone/fragment/actuator/AircraftActuatorFragment.java @@ -0,0 +1,112 @@ +package sq.rogue.rosettadrone.fragment.actuator; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.RadioButton; +import android.widget.RadioGroup; +import android.widget.TextView; + +import androidx.appcompat.widget.AppCompatCheckBox; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.fragment.app.Fragment; +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.Unbinder; +import dji.common.mission.waypointv2.Action.ActionTypes; +import dji.common.mission.waypointv2.Action.WaypointActuator; +import dji.common.mission.waypointv2.Action.WaypointAircraftControlParam; +import dji.common.mission.waypointv2.Action.WaypointAircraftControlRotateYawParam; +import dji.common.mission.waypointv2.Action.WaypointAircraftControlStartStopFlyParam; +import dji.common.mission.waypointv2.WaypointV2MissionTypes; +import sq.rogue.rosettadrone.R; +import sq.rogue.rosettadrone.settings.Tools; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link AircraftActuatorFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class AircraftActuatorFragment extends Fragment implements IActuatorCallback { + + + Unbinder unbinder; + @BindView(R.id.rb_rotate_yaw) + RadioButton rbRotateYaw; + @BindView(R.id.rb_start_stop_fly) + RadioButton rbStartStopFly; + @BindView(R.id.radio_type) + RadioGroup radioType; + @BindView(R.id.tv_tip_yaw) + TextView tvTipYaw; + @BindView(R.id.box_yaw_relative) + AppCompatCheckBox boxYawRelative; + @BindView(R.id.box_yaw_clockwise) + AppCompatCheckBox boxYawClockwise; + @BindView(R.id.cl_yaw) + ConstraintLayout clYaw; + @BindView(R.id.box_start_stop_fly) + AppCompatCheckBox boxStartStopFly; + @BindView(R.id.cl_start_stop) + ConstraintLayout clStartStop; + @BindView(R.id.et_yaw_angle) + TextView yawAngle; + + private ActionTypes.AircraftControlType type = ActionTypes.AircraftControlType.UNKNOWN; + + public static AircraftActuatorFragment newInstance() { + AircraftActuatorFragment fragment = new AircraftActuatorFragment(); + return fragment; + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View root = inflater.inflate(R.layout.fragment_aircraft_actuator, container, false); + unbinder = ButterKnife.bind(this, root); + radioType.setOnCheckedChangeListener((group, checkedId) -> { + switch (checkedId) { + case R.id.rb_rotate_yaw: + clYaw.setVisibility(View.VISIBLE); + clStartStop.setVisibility(View.GONE); + type = ActionTypes.AircraftControlType.ROTATE_YAW; + break; + case R.id.rb_start_stop_fly: + clStartStop.setVisibility(View.VISIBLE); + clYaw.setVisibility(View.GONE); + type = ActionTypes.AircraftControlType.START_STOP_FLY; + break; + } + }); + return root; + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + unbinder.unbind(); + } + + @Override + public WaypointActuator getActuator() { + float yaw = Tools.getFloat(yawAngle.getText().toString(), 0); + WaypointAircraftControlRotateYawParam yawParam = new WaypointAircraftControlRotateYawParam.Builder() + .setDirection(boxYawClockwise.isChecked() ? WaypointV2MissionTypes.WaypointV2TurnMode.CLOCKWISE : WaypointV2MissionTypes.WaypointV2TurnMode.COUNTER_CLOCKWISE) + .setRelative(boxYawRelative.isChecked()) + .setYawAngle(yaw) + .build(); + WaypointAircraftControlStartStopFlyParam startParam = new WaypointAircraftControlStartStopFlyParam.Builder() + .setStartFly(boxStartStopFly.isChecked()) + .build(); + WaypointAircraftControlParam controlParam = new WaypointAircraftControlParam.Builder() + .setAircraftControlType(type) + .setFlyControlParam(startParam) + .setRotateYawParam(yawParam) + .build(); + + return new WaypointActuator.Builder() + .setActuatorType(ActionTypes.ActionActuatorType.AIRCRAFT_CONTROL) + .setAircraftControlActuatorParam(controlParam) + .build(); + } +} diff --git a/app/src/main/java/sq/rogue/rosettadrone/fragment/actuator/CameraActuatorFragment.java b/app/src/main/java/sq/rogue/rosettadrone/fragment/actuator/CameraActuatorFragment.java new file mode 100644 index 0000000..d0bec13 --- /dev/null +++ b/app/src/main/java/sq/rogue/rosettadrone/fragment/actuator/CameraActuatorFragment.java @@ -0,0 +1,152 @@ +package sq.rogue.rosettadrone.fragment.actuator; + +import android.graphics.PointF; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.EditText; +import android.widget.RadioButton; +import android.widget.RadioGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.Unbinder; +import dji.common.mission.waypointv2.Action.ActionTypes; +import dji.common.mission.waypointv2.Action.WaypointActuator; +import dji.common.mission.waypointv2.Action.WaypointCameraActuatorParam; +import dji.common.mission.waypointv2.Action.WaypointCameraFocusParam; +import dji.common.mission.waypointv2.Action.WaypointCameraZoomParam; +import sq.rogue.rosettadrone.R; +import sq.rogue.rosettadrone.settings.Tools; + +; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link CameraActuatorFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class CameraActuatorFragment extends Fragment implements IActuatorCallback { + + @BindView(R.id.rb_shoot_single_photo) + RadioButton rbShootSinglePhoto; + @BindView(R.id.rb_start_record_video) + RadioButton rbStartRecordVideo; + @BindView(R.id.rb_stop_record_video) + RadioButton rbStopRecordVideo; + @BindView(R.id.rb_focus) + RadioButton rbFocus; + @BindView(R.id.rb_zoom) + RadioButton rbZoom; + @BindView(R.id.radio_camera_type) + RadioGroup radioCameraType; + @BindView(R.id.et_zoom) + EditText etZoom; + + @BindView(R.id.et_focus_target_x) + EditText etFocusTargetX; + @BindView(R.id.et_focus_target_y) + EditText etFocusTargetY; + + Unbinder unbinder; + + public static CameraActuatorFragment newInstance() { + CameraActuatorFragment fragment = new CameraActuatorFragment(); + return fragment; + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View root = inflater.inflate(R.layout.fragment_camera_actuator, container, false); + unbinder = ButterKnife.bind(this, root); + return root; + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + unbinder.unbind(); + } + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + radioCameraType.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(RadioGroup group, int checkedId) { + switch (checkedId) { + case R.id.rb_shoot_single_photo: + hide(R.id.et_focus_target_x, R.id.et_focus_target_y, R.id.et_zoom); + break; + case R.id.rb_start_record_video: + hide(R.id.et_focus_target_x, R.id.et_focus_target_y, R.id.et_zoom); + break; + case R.id.rb_stop_record_video: + hide(R.id.et_focus_target_x, R.id.et_focus_target_y, R.id.et_zoom); + break; + case R.id.rb_focus: + hide(R.id.et_zoom); + show(R.id.et_focus_target_x, R.id.et_focus_target_y); + break; + case R.id.rb_zoom: + show(R.id.et_zoom); + hide(R.id.et_focus_target_x, R.id.et_focus_target_y); + break; + } + } + }); + } + + private void hide(int... ids) { + for (int id : ids) { + getView().findViewById(id).setVisibility(View.GONE); + } + } + + private void show(int... ids) { + for (int id : ids) { + getView().findViewById(id).setVisibility(View.VISIBLE); + } + } + + @Override + public WaypointActuator getActuator() { + int focalLength = Tools.getInt(etZoom.getText().toString(), 10); + ActionTypes.CameraOperationType type = getType(); + WaypointCameraFocusParam focusParam = new WaypointCameraFocusParam.Builder() + .focusTarget(new PointF(Tools.getFloat(etFocusTargetX.getText().toString(), 0.5f), Tools.getFloat(etFocusTargetY.getText().toString(), 0.5f))) + .build(); + WaypointCameraZoomParam zoomParam = new WaypointCameraZoomParam.Builder() + .setFocalLength(focalLength) + .build(); + WaypointCameraActuatorParam actuatorParam = new WaypointCameraActuatorParam.Builder() + .setCameraOperationType(type) + .setFocusParam(focusParam) + .setZoomParam(zoomParam) + .build(); + return new WaypointActuator.Builder() + .setActuatorType(ActionTypes.ActionActuatorType.CAMERA) + .setCameraActuatorParam(actuatorParam) + .build(); + } + + public ActionTypes.CameraOperationType getType() { + switch (radioCameraType.getCheckedRadioButtonId()) { + case R.id.rb_shoot_single_photo: + return ActionTypes.CameraOperationType.SHOOT_SINGLE_PHOTO; + case R.id.rb_start_record_video: + return ActionTypes.CameraOperationType.START_RECORD_VIDEO; + case R.id.rb_stop_record_video: + return ActionTypes.CameraOperationType.STOP_RECORD_VIDEO; + case R.id.rb_focus: + return ActionTypes.CameraOperationType.FOCUS; + case R.id.rb_zoom: + return ActionTypes.CameraOperationType.ZOOM; + } + return ActionTypes.CameraOperationType.SHOOT_SINGLE_PHOTO; + } +} diff --git a/app/src/main/java/sq/rogue/rosettadrone/fragment/actuator/GimbalActuatorFragment.java b/app/src/main/java/sq/rogue/rosettadrone/fragment/actuator/GimbalActuatorFragment.java new file mode 100644 index 0000000..8d21334 --- /dev/null +++ b/app/src/main/java/sq/rogue/rosettadrone/fragment/actuator/GimbalActuatorFragment.java @@ -0,0 +1,149 @@ +package sq.rogue.rosettadrone.fragment.actuator; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.EditText; +import android.widget.RadioButton; +import android.widget.RadioGroup; +import android.widget.TextView; +import android.widget.Toast; + +import androidx.appcompat.widget.AppCompatCheckBox; +import androidx.fragment.app.Fragment; +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.Unbinder; +import dji.common.gimbal.Rotation; +import dji.common.gimbal.RotationMode; +import dji.common.mission.waypointv2.Action.ActionTypes; +import dji.common.mission.waypointv2.Action.WaypointActuator; +import dji.common.mission.waypointv2.Action.WaypointGimbalActuatorParam; +import sq.rogue.rosettadrone.R; +import sq.rogue.rosettadrone.fragment.trigger.ITriggerCallback; +import sq.rogue.rosettadrone.settings.Tools; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link GimbalActuatorFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class GimbalActuatorFragment extends Fragment implements IActuatorCallback { + private ITriggerCallback callback; + + Unbinder unbinder; + @BindView(R.id.tv_title) + TextView tvTitle; + @BindView(R.id.rb_rotate_gimbal) + RadioButton rbRotateGimbal; + @BindView(R.id.rb_aircraft_control_gimbal) + RadioButton rbAircraftControlGimbal; + @BindView(R.id.radio_gimbal_type) + RadioGroup radioGimbalType; + @BindView(R.id.et_gimbal_roll) + EditText etGimbalRoll; + @BindView(R.id.et_gimbal_pitch) + EditText etGimbalPitch; + @BindView(R.id.et_gimbal_yaw) + EditText etGimbalYaw; + @BindView(R.id.et_duration_time) + EditText etDurationTime; + @BindView(R.id.box_absulote) + AppCompatCheckBox boxAbsulote; + @BindView(R.id.box_rollIgnore) + AppCompatCheckBox boxRollIgnore; + @BindView(R.id.box_pitch_ignore) + AppCompatCheckBox boxPitchIgnore; + @BindView(R.id.box_yaw_igore) + AppCompatCheckBox boxYawIgore; + @BindView(R.id.box_abs_yaw_ref) + AppCompatCheckBox boxAbsYawRef; + + public static GimbalActuatorFragment newInstance(ITriggerCallback callback) { + GimbalActuatorFragment fragment = new GimbalActuatorFragment(callback); + return fragment; + } + + private GimbalActuatorFragment(ITriggerCallback callback) { + this.callback = callback; + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View root = inflater.inflate(R.layout.fragment_gimbal_actuator, container, false); + unbinder = ButterKnife.bind(this, root); + flush(); + return root; + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + unbinder.unbind(); + } + + public void flush() { + if (getContext() == null) { + return; + } + if (callback.getTrigger() == null) { + Toast.makeText(getContext(), "please select trigger.", Toast.LENGTH_SHORT).show(); + rbAircraftControlGimbal.setVisibility(View.GONE); + rbRotateGimbal.setVisibility(View.VISIBLE); + return; + } + if (callback.getTrigger().getTriggerType() == ActionTypes.ActionTriggerType.TRAJECTORY) { + rbAircraftControlGimbal.setVisibility(View.VISIBLE); + rbRotateGimbal.setVisibility(View.GONE); + } else { + rbAircraftControlGimbal.setVisibility(View.GONE); + rbRotateGimbal.setVisibility(View.VISIBLE); + } + } + + @Override + public WaypointActuator getActuator() { + float roll = Tools.getFloat(etGimbalRoll.getText().toString(), 0.1f); + float pitch = Tools.getFloat(etGimbalPitch.getText().toString(), 0.2f); + float yaw = Tools.getFloat(etGimbalYaw.getText().toString(), 0.3f); + int duration = Tools.getInt(etDurationTime.getText().toString(), 10); + ActionTypes.GimbalOperationType type = getType(); + + Rotation.Builder rotationBuilder = new Rotation.Builder(); + if (!boxRollIgnore.isChecked()) { + rotationBuilder.roll(roll); + } + if (!boxPitchIgnore.isChecked()) { + rotationBuilder.pitch(pitch); + } + if (!boxYawIgore.isChecked()) { + rotationBuilder.yaw(yaw); + } + if (boxAbsulote.isChecked()) { + rotationBuilder.mode(RotationMode.ABSOLUTE_ANGLE); + } else { + rotationBuilder.mode(RotationMode.RELATIVE_ANGLE); + } + rotationBuilder.time(duration); + WaypointGimbalActuatorParam actuatorParam = new WaypointGimbalActuatorParam.Builder() + .operationType(type) + .rotation(rotationBuilder.build()) + .build(); + return new WaypointActuator.Builder() + .setActuatorType(ActionTypes.ActionActuatorType.GIMBAL) + .setGimbalActuatorParam(actuatorParam) + .build(); + } + + public ActionTypes.GimbalOperationType getType() { + switch (radioGimbalType.getCheckedRadioButtonId()) { + case R.id.rb_rotate_gimbal: + return ActionTypes.GimbalOperationType.ROTATE_GIMBAL; + case R.id.rb_aircraft_control_gimbal: + // Rotates the gimbal. Only valid when the trigger type is `TRAJECTORY`. + return ActionTypes.GimbalOperationType.AIRCRAFT_CONTROL_GIMBAL; + } + return ActionTypes.GimbalOperationType.UNKNOWN; + } +} diff --git a/app/src/main/java/sq/rogue/rosettadrone/fragment/actuator/IActuatorCallback.java b/app/src/main/java/sq/rogue/rosettadrone/fragment/actuator/IActuatorCallback.java new file mode 100644 index 0000000..e4ef336 --- /dev/null +++ b/app/src/main/java/sq/rogue/rosettadrone/fragment/actuator/IActuatorCallback.java @@ -0,0 +1,7 @@ +package sq.rogue.rosettadrone.fragment.actuator; + +import dji.common.mission.waypointv2.Action.WaypointActuator; + +public interface IActuatorCallback { + WaypointActuator getActuator(); +} diff --git a/app/src/main/java/sq/rogue/rosettadrone/fragment/trigger/AssociateTriggerFragment.java b/app/src/main/java/sq/rogue/rosettadrone/fragment/trigger/AssociateTriggerFragment.java new file mode 100644 index 0000000..d62f483 --- /dev/null +++ b/app/src/main/java/sq/rogue/rosettadrone/fragment/trigger/AssociateTriggerFragment.java @@ -0,0 +1,78 @@ +package sq.rogue.rosettadrone.fragment.trigger; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.EditText; +import android.widget.RadioGroup; + +import androidx.appcompat.widget.AppCompatRadioButton; +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.Unbinder; +import dji.common.mission.waypointv2.Action.ActionTypes; +import dji.common.mission.waypointv2.Action.WaypointTrigger; +import dji.common.mission.waypointv2.Action.WaypointV2AssociateTriggerParam; +import sq.rogue.rosettadrone.R; +import sq.rogue.rosettadrone.settings.Tools; + +public class AssociateTriggerFragment extends BaseTriggerFragment implements ITriggerCallback { + + + @BindView(R.id.et_wait_time) + EditText etWaitTime; + Unbinder unbinder; + @BindView(R.id.radio_group_type) + RadioGroup radioGroupType; + @BindView(R.id.rb_sync) + AppCompatRadioButton rbSync; + @BindView(R.id.rb_after) + AppCompatRadioButton rbAfter; + @BindView(R.id.et_action_id) + EditText etActionId; + + public AssociateTriggerFragment() { + } + + public static AssociateTriggerFragment newInstance() { + AssociateTriggerFragment fragment = new AssociateTriggerFragment(); + return fragment; + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View root = inflater.inflate(R.layout.fragment_associate_trigger, container, false); + unbinder = ButterKnife.bind(this, root); + return root; + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + unbinder.unbind(); + } + + @Override + public WaypointTrigger getTrigger() { + float waitTime = Tools.getFloat(etWaitTime.getText().toString(), 1); + ActionTypes.AssociatedTimingType type = rbSync.isChecked() + ? ActionTypes.AssociatedTimingType.SIMULTANEOUSLY : ActionTypes.AssociatedTimingType.AFTER_FINISHED; + int actionId = Tools.getInt(etActionId.getText().toString(), 1); + + if (actionId > size) { + Tools.showToast(getActivity(), "actionId can`t bigger existed action size, size=" + size); + return null; + } + + WaypointV2AssociateTriggerParam param = new WaypointV2AssociateTriggerParam.Builder() + .setAssociateType(type) + .setWaitingTime(waitTime) + .setAssociateActionID(actionId) + .build(); + return new WaypointTrigger.Builder() + .setTriggerType(ActionTypes.ActionTriggerType.ASSOCIATE) + .setAssociateParam(param) + .build(); + } +} diff --git a/app/src/main/java/sq/rogue/rosettadrone/fragment/trigger/BaseTriggerFragment.java b/app/src/main/java/sq/rogue/rosettadrone/fragment/trigger/BaseTriggerFragment.java new file mode 100644 index 0000000..465b0d2 --- /dev/null +++ b/app/src/main/java/sq/rogue/rosettadrone/fragment/trigger/BaseTriggerFragment.java @@ -0,0 +1,11 @@ +package sq.rogue.rosettadrone.fragment.trigger; + +import androidx.fragment.app.Fragment; + +public class BaseTriggerFragment extends Fragment { + protected int size; + + public void setSize(int size) { + this.size = size; + } +} diff --git a/app/src/main/java/sq/rogue/rosettadrone/fragment/trigger/ITriggerCallback.java b/app/src/main/java/sq/rogue/rosettadrone/fragment/trigger/ITriggerCallback.java new file mode 100644 index 0000000..385cfb9 --- /dev/null +++ b/app/src/main/java/sq/rogue/rosettadrone/fragment/trigger/ITriggerCallback.java @@ -0,0 +1,7 @@ +package sq.rogue.rosettadrone.fragment.trigger; + +import dji.common.mission.waypointv2.Action.WaypointTrigger; + +public interface ITriggerCallback { + WaypointTrigger getTrigger(); +} diff --git a/app/src/main/java/sq/rogue/rosettadrone/fragment/trigger/ReachPointTriggerFragment.java b/app/src/main/java/sq/rogue/rosettadrone/fragment/trigger/ReachPointTriggerFragment.java new file mode 100644 index 0000000..4df4e9d --- /dev/null +++ b/app/src/main/java/sq/rogue/rosettadrone/fragment/trigger/ReachPointTriggerFragment.java @@ -0,0 +1,71 @@ +package sq.rogue.rosettadrone.fragment.trigger; + + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.EditText; + +import androidx.fragment.app.Fragment; +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.Unbinder; +import dji.common.mission.waypointv2.Action.ActionTypes; +import dji.common.mission.waypointv2.Action.WaypointReachPointTriggerParam; +import dji.common.mission.waypointv2.Action.WaypointTrigger; +import sq.rogue.rosettadrone.R; +import sq.rogue.rosettadrone.settings.Tools; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link ReachPointTriggerFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class ReachPointTriggerFragment extends BaseTriggerFragment implements ITriggerCallback { + + + @BindView(R.id.et_start_index) + EditText etStartIndex; + @BindView(R.id.et_auto_terminate_count) + EditText etAutoTerminateCount; + Unbinder unbinder; + + public static ReachPointTriggerFragment newInstance() { + ReachPointTriggerFragment fragment = new ReachPointTriggerFragment(); + return fragment; + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View root = inflater.inflate(R.layout.fragment_simple_reach_point_trigger, container, false); + unbinder = ButterKnife.bind(this, root); + return root; + } + + @Override + public WaypointTrigger getTrigger() { + int start = Tools.getInt(etStartIndex.getText().toString(), 1); + int count = Tools.getInt(etAutoTerminateCount.getText().toString(), 1); + + if (start > size) { + Tools.showToast(getActivity(), "start can`t bigger waypoint mission size, size=" + size); + return null; + } + + WaypointReachPointTriggerParam param = new WaypointReachPointTriggerParam.Builder() + .setAutoTerminateCount(count) + .setStartIndex(start) + .build(); + return new WaypointTrigger.Builder() + .setTriggerType(ActionTypes.ActionTriggerType.REACH_POINT) + .setReachPointParam(param) + .build(); + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + unbinder.unbind(); + } +} diff --git a/app/src/main/java/sq/rogue/rosettadrone/fragment/trigger/SimpleIntervalTriggerFragment.java b/app/src/main/java/sq/rogue/rosettadrone/fragment/trigger/SimpleIntervalTriggerFragment.java new file mode 100644 index 0000000..89f5005 --- /dev/null +++ b/app/src/main/java/sq/rogue/rosettadrone/fragment/trigger/SimpleIntervalTriggerFragment.java @@ -0,0 +1,82 @@ +package sq.rogue.rosettadrone.fragment.trigger; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.EditText; +import android.widget.RadioGroup; + +import androidx.appcompat.widget.AppCompatRadioButton; +import androidx.fragment.app.Fragment; +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.Unbinder; +import dji.common.mission.waypointv2.Action.ActionTypes; +import dji.common.mission.waypointv2.Action.WaypointIntervalTriggerParam; +import dji.common.mission.waypointv2.Action.WaypointTrigger; +import sq.rogue.rosettadrone.R; +import sq.rogue.rosettadrone.settings.Tools; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link SimpleIntervalTriggerFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class SimpleIntervalTriggerFragment extends BaseTriggerFragment implements ITriggerCallback { + + + @BindView(R.id.et_start_index) + EditText etStartIndex; + @BindView(R.id.radio_group_type) + RadioGroup radioGroupType; + @BindView(R.id.et_value) + EditText etValue; + @BindView(R.id.rb_distance) + AppCompatRadioButton rbDistance; + @BindView(R.id.rb_time) + AppCompatRadioButton rbTime; + + Unbinder unbinder; + + public static SimpleIntervalTriggerFragment newInstance() { + SimpleIntervalTriggerFragment fragment = new SimpleIntervalTriggerFragment(); + return fragment; + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View root = inflater.inflate(R.layout.fragment_simple_interval_trigger, container, false); + unbinder = ButterKnife.bind(this, root); + return root; + } + + @Override + public WaypointTrigger getTrigger() { + float value = Tools.getFloat(etValue.getText().toString(), 1.1f); + int start = Tools.getInt(etStartIndex.getText().toString(), 1); + + if (start > size) { + Tools.showToast(getActivity(), "start can`t bigger waypoint mission size, size=" + size); + return null; + } + + ActionTypes.ActionIntervalType type = rbDistance.isChecked() + ? ActionTypes.ActionIntervalType.DISTANCE : ActionTypes.ActionIntervalType.TIME; + WaypointIntervalTriggerParam param = new WaypointIntervalTriggerParam.Builder() + .setStartIndex(start) + .setInterval(value) + .setType(type) + .build(); + return new WaypointTrigger.Builder() + .setTriggerType(ActionTypes.ActionTriggerType.SIMPLE_INTERVAL) + .setIntervalTriggerParam(param) + .build(); + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + unbinder.unbind(); + } +} diff --git a/app/src/main/java/sq/rogue/rosettadrone/fragment/trigger/TrajectoryTriggerFragment.java b/app/src/main/java/sq/rogue/rosettadrone/fragment/trigger/TrajectoryTriggerFragment.java new file mode 100644 index 0000000..61948ae --- /dev/null +++ b/app/src/main/java/sq/rogue/rosettadrone/fragment/trigger/TrajectoryTriggerFragment.java @@ -0,0 +1,65 @@ +package sq.rogue.rosettadrone.fragment.trigger; + + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.EditText; + +import androidx.fragment.app.Fragment; +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.Unbinder; +import dji.common.mission.waypointv2.Action.ActionTypes; +import dji.common.mission.waypointv2.Action.WaypointTrajectoryTriggerParam; +import dji.common.mission.waypointv2.Action.WaypointTrigger; +import sq.rogue.rosettadrone.R; +import sq.rogue.rosettadrone.settings.Tools; + +/** + * A simple {@link Fragment} subclass. + * Use the {@link TrajectoryTriggerFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class TrajectoryTriggerFragment extends BaseTriggerFragment implements ITriggerCallback { + + @BindView(R.id.et_start_index) + EditText etStartIndex; + @BindView(R.id.et_end_index) + EditText etEndIndex; + Unbinder unbinder; + + public static TrajectoryTriggerFragment newInstance() { + TrajectoryTriggerFragment fragment = new TrajectoryTriggerFragment(); + return fragment; + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View root = inflater.inflate(R.layout.fragment_trajectory_trigger, container, false); + unbinder = ButterKnife.bind(this, root); + return root; + } + + @Override + public WaypointTrigger getTrigger() { + int start = Tools.getInt(etStartIndex.getText().toString(), 1); + int end = Tools.getInt(etEndIndex.getText().toString(), 1); + + WaypointTrajectoryTriggerParam param = new WaypointTrajectoryTriggerParam.Builder() + .setEndIndex(end) + .setStartIndex(start) + .build(); + return new WaypointTrigger.Builder() + .setTriggerType(ActionTypes.ActionTriggerType.TRAJECTORY) + .setTrajectoryParam(param) + .build(); + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + unbinder.unbind(); + } +} diff --git a/app/src/main/java/sq/rogue/rosettadrone/logs/LogFragment.java b/app/src/main/java/sq/rogue/rosettadrone/logs/LogFragment.java index c6f9b32..64a3e7c 100644 --- a/app/src/main/java/sq/rogue/rosettadrone/logs/LogFragment.java +++ b/app/src/main/java/sq/rogue/rosettadrone/logs/LogFragment.java @@ -2,9 +2,6 @@ package sq.rogue.rosettadrone.logs; import android.annotation.SuppressLint; import android.os.Bundle; - -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; import android.text.Editable; import android.text.TextWatcher; import android.view.LayoutInflater; @@ -14,15 +11,17 @@ import android.view.ViewTreeObserver; import android.widget.ScrollView; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import sq.rogue.rosettadrone.R; public class LogFragment extends Fragment { -// final Handler handler = new Handler(); + // final Handler handler = new Handler(); private final String TAG = getClass().getSimpleName(); // private final String INSTANCE_STATE_KEY = "saved_state"; private final int DEFAULT_MAX_CHARACTERS = 200000; -// GestureDetector gestureDetector; + // GestureDetector gestureDetector; private TextView mTextViewTraffic; private ScrollView mScrollView; // Runnable mLongPressed = new Runnable() { diff --git a/app/src/main/java/sq/rogue/rosettadrone/settings/AiActivity.java b/app/src/main/java/sq/rogue/rosettadrone/settings/AiActivity.java deleted file mode 100644 index 8fafbf0..0000000 --- a/app/src/main/java/sq/rogue/rosettadrone/settings/AiActivity.java +++ /dev/null @@ -1,61 +0,0 @@ -package sq.rogue.rosettadrone.settings; - -import android.os.Bundle; -import android.util.Log; - -import androidx.appcompat.app.AppCompatActivity; -import androidx.fragment.app.FragmentTransaction; -import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.PreferenceScreen; -import sq.rogue.rosettadrone.R; -import sq.rogue.rosettadrone.settings.drone.DroneSettingsFragment; - -public class AiActivity extends AppCompatActivity implements PreferenceFragmentCompat.OnPreferenceStartScreenCallback { - private static final String TAG = AiActivity.class.getSimpleName(); - - /** - * @param savedInstanceState Any saved state we are carrying over into the new activity instance - */ - @Override - protected void onCreate(Bundle savedInstanceState) { - Log.d(TAG, "onCreate"); - - super.onCreate(savedInstanceState); - setContentView(R.layout.ai_layout); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); - getSupportActionBar().setDisplayShowHomeEnabled(true); - -// // Display the fragment as the main content. -// getFragmentManager().beginTransaction() -// .replace(android.R.id.content, new SettingsFragment()) -// .commit(); - } - - @Override - public boolean onSupportNavigateUp() { - onBackPressed(); - return true; - } - - @Override - public void onBackPressed() { - super.onBackPressed(); - setTitle(R.string.settings); - } - - @Override - public boolean onPreferenceStartScreen(PreferenceFragmentCompat caller, PreferenceScreen preferenceScreen) { - Log.d(TAG, "onPreferenceStartScreen"); -// Log.d(TAG, "callback called to attach the preference sub screen"); - FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); - DroneSettingsFragment fragment = new DroneSettingsFragment(); - Bundle args = new Bundle(); - args.putString(PreferenceFragmentCompat.ARG_PREFERENCE_ROOT, preferenceScreen.getKey()); - fragment.setArguments(args); - ft.replace(R.id.pref_container, fragment, preferenceScreen.getKey()); - ft.addToBackStack(preferenceScreen.getKey()); - ft.commit(); - setTitle(preferenceScreen.getTitle()); - return true; - } -} \ No newline at end of file diff --git a/app/src/main/java/sq/rogue/rosettadrone/settings/GeneralUtils.java b/app/src/main/java/sq/rogue/rosettadrone/settings/GeneralUtils.java index 62ff698..94b928b 100644 --- a/app/src/main/java/sq/rogue/rosettadrone/settings/GeneralUtils.java +++ b/app/src/main/java/sq/rogue/rosettadrone/settings/GeneralUtils.java @@ -1,6 +1,7 @@ package sq.rogue.rosettadrone.settings; import android.util.Log; + import dji.common.error.DJIError; import dji.common.util.CommonCallbacks; @@ -55,7 +56,7 @@ public class GeneralUtils { return new CommonCallbacks.CompletionCallback() { @Override public void onResult(DJIError djiError) { - Log.d("GeneralUtils",djiError == null ? "Succeed!" : "failed!" + djiError.getDescription()); + Log.d("GeneralUtils", djiError == null ? "Succeed!" : "failed!" + djiError.getDescription()); } }; } diff --git a/app/src/main/java/sq/rogue/rosettadrone/settings/MapActivity.java b/app/src/main/java/sq/rogue/rosettadrone/settings/MapActivity.java index e9270ed..a0428fb 100644 --- a/app/src/main/java/sq/rogue/rosettadrone/settings/MapActivity.java +++ b/app/src/main/java/sq/rogue/rosettadrone/settings/MapActivity.java @@ -96,7 +96,7 @@ public class MapActivity extends FragmentActivity implements View.OnClickListene @Override protected void onDestroy() { - if(mReceiver.getResultCode() < 0 ) + if (mReceiver.getResultCode() < 0) unregisterReceiver(mReceiver); removeListener(); super.onDestroy(); @@ -163,9 +163,9 @@ public class MapActivity extends FragmentActivity implements View.OnClickListene setContentView(R.layout.activity_help); - // IntentFilter filter = new IntentFilter(); - // filter.addAction(DJIDemoApplication.FLAG_CONNECTION_CHANGE); - // registerReceiver(mReceiver, filter); + // IntentFilter filter = new IntentFilter(); + // filter.addAction(DJIDemoApplication.FLAG_CONNECTION_CHANGE); + // registerReceiver(mReceiver, filter); initUI(); @@ -212,7 +212,7 @@ public class MapActivity extends FragmentActivity implements View.OnClickListene if (RDApplication.getSim() == true) { product = DJISimulatorApplication.getAircraftInstance(); - }else { + } else { product = RDApplication.getProductInstance(); } @@ -325,7 +325,7 @@ public class MapActivity extends FragmentActivity implements View.OnClickListene } if (checkGpsCoordination(droneLocationLat, droneLocationLng)) { - // droneMarker = gMap.addMarker(markerOptions); + // droneMarker = gMap.addMarker(markerOptions); } } }); @@ -398,7 +398,7 @@ public class MapActivity extends FragmentActivity implements View.OnClickListene CameraUpdate cu = CameraUpdateFactory.newLatLngZoom(pos, zoomlevel); gMap.moveCamera(cu); } - + private void enableDisableAdd() { if (isAdd == false) { isAdd = true; diff --git a/app/src/main/java/sq/rogue/rosettadrone/settings/SettingsActivity.java b/app/src/main/java/sq/rogue/rosettadrone/settings/SettingsActivity.java index 9860832..0fbc296 100644 --- a/app/src/main/java/sq/rogue/rosettadrone/settings/SettingsActivity.java +++ b/app/src/main/java/sq/rogue/rosettadrone/settings/SettingsActivity.java @@ -1,13 +1,13 @@ package sq.rogue.rosettadrone.settings; import android.os.Bundle; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentTransaction; -import androidx.appcompat.app.AppCompatActivity; -import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.PreferenceScreen; import android.util.Log; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceScreen; import sq.rogue.rosettadrone.R; import sq.rogue.rosettadrone.settings.drone.DroneSettingsFragment; diff --git a/app/src/main/java/sq/rogue/rosettadrone/settings/SettingsFragment.java b/app/src/main/java/sq/rogue/rosettadrone/settings/SettingsFragment.java index fbc5393..57c5e02 100644 --- a/app/src/main/java/sq/rogue/rosettadrone/settings/SettingsFragment.java +++ b/app/src/main/java/sq/rogue/rosettadrone/settings/SettingsFragment.java @@ -2,23 +2,23 @@ package sq.rogue.rosettadrone.settings; import android.content.SharedPreferences; import android.os.Bundle; +import android.util.Patterns; + import androidx.preference.EditTextPreference; import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceGroup; -import android.util.Patterns; - import sq.rogue.rosettadrone.MainActivity; import sq.rogue.rosettadrone.NotificationHandler; import sq.rogue.rosettadrone.R; +import static sq.rogue.rosettadrone.util.TYPE_APP_NAME; import static sq.rogue.rosettadrone.util.TYPE_GCS_IP; import static sq.rogue.rosettadrone.util.TYPE_GCS_PORT; import static sq.rogue.rosettadrone.util.TYPE_VIDEO_BITRATE; import static sq.rogue.rosettadrone.util.TYPE_VIDEO_IP; import static sq.rogue.rosettadrone.util.TYPE_VIDEO_PORT; -import static sq.rogue.rosettadrone.util.TYPE_APP_NAME; // Display value of preference in summary field diff --git a/app/src/main/java/sq/rogue/rosettadrone/settings/Tools.java b/app/src/main/java/sq/rogue/rosettadrone/settings/Tools.java new file mode 100644 index 0000000..19b1184 --- /dev/null +++ b/app/src/main/java/sq/rogue/rosettadrone/settings/Tools.java @@ -0,0 +1,31 @@ +package sq.rogue.rosettadrone.settings; + +import android.app.Activity; +import android.widget.Toast; + +public class Tools { + public static int getInt(String str, int defaultValue) { + try { + return Integer.valueOf(str); + } catch (Exception e) { + return defaultValue; + } + } + + public static float getFloat(String str, float defaultValue) { + try { + return Float.valueOf(str); + } catch (Exception e) { + return defaultValue; + } + } + + public static void showToast(final Activity activity, final String msg) { + activity.runOnUiThread(new Runnable() { + @Override + public void run() { + Toast.makeText(activity, msg, Toast.LENGTH_SHORT).show(); + } + }); + } +} diff --git a/app/src/main/java/sq/rogue/rosettadrone/settings/GaodeActivity.java b/app/src/main/java/sq/rogue/rosettadrone/settings/Waypoint1Activity.java similarity index 50% rename from app/src/main/java/sq/rogue/rosettadrone/settings/GaodeActivity.java rename to app/src/main/java/sq/rogue/rosettadrone/settings/Waypoint1Activity.java index 7d218d4..8858551 100644 --- a/app/src/main/java/sq/rogue/rosettadrone/settings/GaodeActivity.java +++ b/app/src/main/java/sq/rogue/rosettadrone/settings/Waypoint1Activity.java @@ -1,540 +1,586 @@ -package sq.rogue.rosettadrone.settings; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.util.Log; -import android.view.View; -import android.widget.Button; -import android.widget.LinearLayout; -import android.widget.RadioGroup; -import android.widget.TextView; -import android.widget.Toast; - -import androidx.annotation.Nullable; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.FragmentActivity; - -import com.amap.api.maps.AMap; -import com.amap.api.maps.AMap.OnMapClickListener; -import com.amap.api.maps.CameraUpdate; -import com.amap.api.maps.CameraUpdateFactory; -import com.amap.api.maps.MapView; -import com.amap.api.maps.model.BitmapDescriptorFactory; -import com.amap.api.maps.model.LatLng; -import com.amap.api.maps.model.Marker; -import com.amap.api.maps.model.MarkerOptions; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import dji.common.error.DJIError; -import dji.common.mission.waypoint.Waypoint; -import dji.common.mission.waypoint.WaypointMission; -import dji.common.mission.waypoint.WaypointMissionDownloadEvent; -import dji.common.mission.waypoint.WaypointMissionExecutionEvent; -import dji.common.mission.waypoint.WaypointMissionFinishedAction; -import dji.common.mission.waypoint.WaypointMissionFlightPathMode; -import dji.common.mission.waypoint.WaypointMissionHeadingMode; -import dji.common.mission.waypoint.WaypointMissionUploadEvent; -import dji.sdk.base.BaseProduct; -import dji.sdk.flightcontroller.FlightController; -import dji.sdk.mission.waypoint.WaypointMissionOperator; -import dji.sdk.mission.waypoint.WaypointMissionOperatorListener; -import dji.sdk.products.Aircraft; -import dji.sdk.sdkmanager.DJISDKManager; -import sq.rogue.rosettadrone.DJISimulatorApplication; -import sq.rogue.rosettadrone.R; -import sq.rogue.rosettadrone.RDApplication; - -/* import com.google.android.gms.common.GooglePlayServicesNotAvailableException; -import com.google.android.gms.maps.CameraUpdate; -import com.google.android.gms.maps.CameraUpdateFactory; -import com.google.android.gms.maps.GoogleMap; -import com.google.android.gms.maps.MapsInitializer; -import com.google.android.gms.maps.OnMapReadyCallback; -import com.google.android.gms.maps.SupportMapFragment; -import com.google.android.gms.maps.model.BitmapDescriptorFactory; -import com.google.android.gms.maps.model.LatLng; -import com.google.android.gms.maps.model.Marker; -import com.google.android.gms.maps.model.MarkerOptions;*/ - -public class GaodeActivity extends FragmentActivity implements View.OnClickListener, OnMapClickListener { - private static final String TAG = GaodeActivity.class.getSimpleName(); - - public static final String FLAG_CONNECTION_CHANGE = "dji_sdk_connection_change"; - - private MapView mapView; - private AMap aMap; - - private Button locate, add, clear, exit; - private Button config, upload, start, stop; - -// private double droneLocationLat = 181, droneLocationLng = 181; - private double droneLocationLat, droneLocationLng; - private Marker droneMarker = null; - private FlightController mFlightController; - - private boolean isAdd = false; - private final Map mMarkers = new ConcurrentHashMap(); - - private float altitude = 100.0f; - private float mSpeed = 10.0f; - - private List waypointList = new ArrayList<>(); - - public static WaypointMission.Builder waypointMissionBuilder; - private WaypointMissionOperator instance; - private WaypointMissionFinishedAction mFinishedAction = WaypointMissionFinishedAction.NO_ACTION; - private WaypointMissionHeadingMode mHeadingMode = WaypointMissionHeadingMode.AUTO; - - @Override - protected void onResume(){ - super.onResume(); - } - - @Override - protected void onPause(){ - super.onPause(); - } - - /*@Override - protected void onDestroy(){ - super.onDestroy(); - }*/ - - /** - * @Description : RETURN BTN RESPONSE FUNCTION - */ - public void onReturn(View view){ - Log.d(TAG, "onReturn"); - this.finish(); - } - - private void initUI() { - locate = (Button) findViewById(R.id.locate); - add = (Button) findViewById(R.id.add); - clear = (Button) findViewById(R.id.clear); - exit = (Button) findViewById(R.id.exit); - config = (Button) findViewById(R.id.config); - upload = (Button) findViewById(R.id.upload); - start = (Button) findViewById(R.id.start); - stop = (Button) findViewById(R.id.stop); - - locate.setOnClickListener(this); - add.setOnClickListener(this); - clear.setOnClickListener(this); - exit.setOnClickListener(this); - config.setOnClickListener(this); - upload.setOnClickListener(this); - start.setOnClickListener(this); - stop.setOnClickListener(this); - } - - private void initMapView() { - - if (aMap == null) { - aMap = mapView.getMap(); - aMap.setOnMapClickListener(this);// add the listener for click for amap object - } - - - LatLng coordinate = new LatLng(60.4094, 10.4911); - - if (checkGpsCoordination(droneLocationLat, droneLocationLng)) { - coordinate = new LatLng(droneLocationLat, droneLocationLng); - } -// aMap.addMarker(new MarkerOptions().position(coordinate).title("Marker in Shenzhen")); - aMap.addMarker(new MarkerOptions().position(coordinate)); - aMap.moveCamera(CameraUpdateFactory.newLatLng(coordinate)); - - } - - - @Override - protected void onDestroy(){ - if(mReceiver.getResultCode() < 0 ) - unregisterReceiver(mReceiver); - removeListener(); - super.onDestroy(); - } - - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_gaode); - - mapView = (MapView) findViewById(R.id.map); - mapView.onCreate(savedInstanceState); - - initMapView(); - - initFlightController(); - - initUI(); - - addListener(); - } - - protected BroadcastReceiver mReceiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - onProductConnectionChange(); - } - }; - - private void onProductConnectionChange() - { - initFlightController(); - } - - private void initFlightController() { -// setResultToToast(droneLocationLat+"----"+droneLocationLng); - - BaseProduct product; - - if (RDApplication.getSim() == true) { - product = DJISimulatorApplication.getAircraftInstance(); - }else { - product = RDApplication.getProductInstance(); - } - - if (product != null && product.isConnected()) { - if (product instanceof Aircraft) { - mFlightController = ((Aircraft) product).getFlightController(); - } - } - - if (mFlightController != null) { - mFlightController.setStateCallback( - djiFlightControllerCurrentState -> { - droneLocationLat = djiFlightControllerCurrentState.getAircraftLocation().getLatitude(); - droneLocationLng = djiFlightControllerCurrentState.getAircraftLocation().getLongitude(); - updateDroneLocation(); - - }); - } - } - - public static boolean checkGpsCoordination(double latitude, double longitude) { - return (latitude > -90 && latitude < 90 && longitude > -180 && longitude < 180) && (latitude != 0f && longitude != 0f); - } - - private void updateDroneLocation(){ - - LatLng pos = new LatLng(droneLocationLat, droneLocationLng); - //Create MarkerOptions object - final MarkerOptions markerOptions = new MarkerOptions(); - markerOptions.position(pos); - markerOptions.icon(BitmapDescriptorFactory.fromResource(R.drawable.aircraft)); - - runOnUiThread(() -> { - if (droneMarker != null) { - droneMarker.remove(); - } - -// setResultToToast(droneLocationLat+"----"+droneLocationLng); - if (checkGpsCoordination(droneLocationLat, droneLocationLng)) { -// setResultToToast("小飞机标识"); - droneMarker = aMap.addMarker(markerOptions); - } - }); - } - - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.locate:{ - updateDroneLocation(); - cameraUpdate(); // Locate the drone's place - break; - } - case R.id.add:{ - enableDisableAdd(); - break; - } - case R.id.clear: { - runOnUiThread(() -> aMap.clear()); - waypointList.clear(); - waypointMissionBuilder.waypointList(waypointList); - updateDroneLocation(); - break; - } - case R.id.config:{ - showSettingDialog(); - break; - } - case R.id.upload:{ - uploadWayPointMission(); - break; - } - case R.id.start:{ - startWaypointMission(); - break; - } - case R.id.stop:{ - stopWaypointMission(); - break; - } - case R.id.exit: { - super.onBackPressed(); - break; - } - default: - break; - } - } - - private void enableDisableAdd(){ - if (isAdd == false) { - isAdd = true; - add.setText("Exit"); - }else{ - isAdd = false; - add.setText("Add"); - } - } - - private void cameraUpdate(){ - LatLng pos = new LatLng(droneLocationLat, droneLocationLng); - float zoomlevel = (float) 18.0; - CameraUpdate cu = CameraUpdateFactory.newLatLngZoom(pos, zoomlevel); - aMap.moveCamera(cu); - } - - private void setResultToToast(final String string){ - GaodeActivity.this.runOnUiThread(() -> Toast.makeText(GaodeActivity.this, string, Toast.LENGTH_SHORT).show()); - } - - @Override - public void onMapClick(LatLng point) { - if (isAdd == true){ - markWaypoint(point); - Waypoint mWaypoint = new Waypoint(point.latitude, point.longitude, altitude); - //Add Waypoints to Waypoint arraylist; - if (waypointMissionBuilder != null) { - waypointList.add(mWaypoint); - waypointMissionBuilder.waypointList(waypointList).waypointCount(waypointList.size()); - }else - { - waypointMissionBuilder = new WaypointMission.Builder(); - waypointList.add(mWaypoint); - waypointMissionBuilder.waypointList(waypointList).waypointCount(waypointList.size()); - } - }else{ - setResultToToast("Cannot Add Waypoint"); - } - } - - private void uploadWayPointMission(){ - - getWaypointMissionOperator().uploadMission(error -> { - if (error == null) { - setResultToToast("Mission upload successfully!"); - } else { - setResultToToast("Mission upload failed, error: " + error.getDescription() + " retrying..."); - getWaypointMissionOperator().retryUploadMission(null); - } - }); - - } - - private void markWaypoint(LatLng point){ - //Create MarkerOptions object - MarkerOptions markerOptions = new MarkerOptions(); - markerOptions.position(point); - markerOptions.icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_BLUE)); - Marker marker = aMap.addMarker(markerOptions); - mMarkers.put(mMarkers.size(), marker); - } - - private void showSettingDialog(){ - LinearLayout wayPointSettings = (LinearLayout)getLayoutInflater().inflate(R.layout.dialog_waypointsetting, null); - - final TextView wpAltitude_TV = (TextView) wayPointSettings.findViewById(R.id.altitude); - RadioGroup speed_RG = (RadioGroup) wayPointSettings.findViewById(R.id.speed); - RadioGroup actionAfterFinished_RG = (RadioGroup) wayPointSettings.findViewById(R.id.actionAfterFinished); - RadioGroup heading_RG = (RadioGroup) wayPointSettings.findViewById(R.id.heading); - - speed_RG.setOnCheckedChangeListener((group, checkedId) -> { - if (checkedId == R.id.lowSpeed){ - mSpeed = 3.0f; - } else if (checkedId == R.id.MidSpeed){ - mSpeed = 5.0f; - } else if (checkedId == R.id.HighSpeed){ - mSpeed = 10.0f; - } - }); - - actionAfterFinished_RG.setOnCheckedChangeListener((group, checkedId) -> { - Log.d(TAG, "Select finish action"); - if (checkedId == R.id.finishNone){ - mFinishedAction = WaypointMissionFinishedAction.NO_ACTION; - } else if (checkedId == R.id.finishGoHome){ - mFinishedAction = WaypointMissionFinishedAction.GO_HOME; - } else if (checkedId == R.id.finishAutoLanding){ - mFinishedAction = WaypointMissionFinishedAction.AUTO_LAND; - } else if (checkedId == R.id.finishToFirst){ - mFinishedAction = WaypointMissionFinishedAction.GO_FIRST_WAYPOINT; - } - }); - - heading_RG.setOnCheckedChangeListener((group, checkedId) -> { - Log.d(TAG, "Select heading"); - - if (checkedId == R.id.headingNext) { - mHeadingMode = WaypointMissionHeadingMode.AUTO; - } else if (checkedId == R.id.headingInitDirec) { - mHeadingMode = WaypointMissionHeadingMode.USING_INITIAL_DIRECTION; - } else if (checkedId == R.id.headingRC) { - mHeadingMode = WaypointMissionHeadingMode.CONTROL_BY_REMOTE_CONTROLLER; - } else if (checkedId == R.id.headingWP) { - mHeadingMode = WaypointMissionHeadingMode.USING_WAYPOINT_HEADING; - } - }); - - new AlertDialog.Builder(this) - .setTitle("") - .setView(wayPointSettings) - .setPositiveButton("Finish", (dialog, id) -> { - - String altitudeString = wpAltitude_TV.getText().toString(); - altitude = Integer.parseInt(nulltoIntegerDefault(altitudeString)); - Log.e(TAG,"altitude "+altitude); - Log.e(TAG,"speed "+mSpeed); - Log.e(TAG, "mFinishedAction "+mFinishedAction); - Log.e(TAG, "mHeadingMode "+mHeadingMode); - configWayPointMission(); - }) - .setNegativeButton("Cancel", (dialog, id) -> dialog.cancel()) - .create() - .show(); - } - - String nulltoIntegerDefault(String value){ - if(!isIntValue(value)) value="0"; - return value; - } - - boolean isIntValue(String val) - { - try { - val=val.replace(" ",""); - Integer.parseInt(val); - } catch (Exception e) {return false;} - return true; - } - - public WaypointMissionOperator getWaypointMissionOperator() { - if (instance == null) { - instance = DJISDKManager.getInstance().getMissionControl().getWaypointMissionOperator(); - } - return instance; - } - - private void configWayPointMission(){ - - if (waypointMissionBuilder == null){ - - waypointMissionBuilder = new WaypointMission.Builder().finishedAction(mFinishedAction) - .headingMode(mHeadingMode) - .autoFlightSpeed(mSpeed) - .maxFlightSpeed(mSpeed) - .flightPathMode(WaypointMissionFlightPathMode.NORMAL); - - }else - { - waypointMissionBuilder.finishedAction(mFinishedAction) - .headingMode(mHeadingMode) - .autoFlightSpeed(mSpeed) - .maxFlightSpeed(mSpeed) - .flightPathMode(WaypointMissionFlightPathMode.NORMAL); - - } - - if (waypointMissionBuilder.getWaypointList().size() > 0){ - - for (int i=0; i< waypointMissionBuilder.getWaypointList().size(); i++){ - waypointMissionBuilder.getWaypointList().get(i).altitude = altitude; - } - - setResultToToast("Set Waypoint attitude successfully"); - } - - DJIError error = getWaypointMissionOperator().loadMission(waypointMissionBuilder.build()); - if (error == null) { - setResultToToast("loadWaypoint succeeded"); - } else { - setResultToToast("loadWaypoint failed " + error.getDescription()); - } - - } - - //Add Listener for WaypointMissionOperator - private void addListener() { - if (getWaypointMissionOperator() != null) { - getWaypointMissionOperator().addListener(eventNotificationListener); - } - } - - private void removeListener() { - if (getWaypointMissionOperator() != null) { - getWaypointMissionOperator().removeListener(eventNotificationListener); - } - } - - private WaypointMissionOperatorListener eventNotificationListener = new WaypointMissionOperatorListener() { - @Override - public void onDownloadUpdate(WaypointMissionDownloadEvent downloadEvent) { - - } - - @Override - public void onUploadUpdate(WaypointMissionUploadEvent uploadEvent) { - - } - - @Override - public void onExecutionUpdate(WaypointMissionExecutionEvent executionEvent) { - - } - - @Override - public void onExecutionStart() { - - } - - @Override - public void onExecutionFinish(@Nullable final DJIError error) { - setResultToToast("Execution finished: " + (error == null ? "Success!" : error.getDescription())); - } - }; - - private void startWaypointMission(){ - getWaypointMissionOperator().startMission(error -> setResultToToast("Mission Start: " + (error == null ? "Successfully" : error.getDescription()))); - - } - - private void stopWaypointMission(){ - getWaypointMissionOperator().stopMission(error -> setResultToToast("Mission Stop: " + (error == null ? "Successfully" : error.getDescription()))); - - } - - @Override - public void onBackPressed() { - super.onBackPressed(); - setTitle(R.string.settings); - } - - /*@Override - public boolean onTouchEvent(MotionEvent event) { - //点击外围，退出窗口 - this.finish(); - return true; - }*/ - -} \ No newline at end of file +package sq.rogue.rosettadrone.settings; + +import android.Manifest; +import android.app.AlertDialog; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.IntentFilter; +import android.os.Build; +import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.widget.Button; +import android.widget.LinearLayout; +import android.widget.RadioGroup; +import android.widget.TextView; +import android.widget.Toast; + +import com.google.android.gms.maps.CameraUpdate; +import com.google.android.gms.maps.CameraUpdateFactory; +import com.google.android.gms.maps.GoogleMap; +import com.google.android.gms.maps.OnMapReadyCallback; +import com.google.android.gms.maps.SupportMapFragment; +import com.google.android.gms.maps.model.BitmapDescriptorFactory; +import com.google.android.gms.maps.model.LatLng; +import com.google.android.gms.maps.model.Marker; +import com.google.android.gms.maps.model.MarkerOptions; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import androidx.annotation.Nullable; +import androidx.core.app.ActivityCompat; +import androidx.fragment.app.FragmentActivity; +import dji.common.error.DJIError; +import dji.common.flightcontroller.FlightControllerState; +import dji.common.mission.waypoint.Waypoint; +import dji.common.mission.waypoint.WaypointMission; +import dji.common.mission.waypoint.WaypointMissionDownloadEvent; +import dji.common.mission.waypoint.WaypointMissionExecutionEvent; +import dji.common.mission.waypoint.WaypointMissionFinishedAction; +import dji.common.mission.waypoint.WaypointMissionFlightPathMode; +import dji.common.mission.waypoint.WaypointMissionHeadingMode; +import dji.common.mission.waypoint.WaypointMissionUploadEvent; +import dji.common.useraccount.UserAccountState; +import dji.common.util.CommonCallbacks; +import dji.sdk.base.BaseProduct; +import dji.sdk.flightcontroller.FlightController; +import dji.sdk.mission.waypoint.WaypointMissionOperator; +import dji.sdk.mission.waypoint.WaypointMissionOperatorListener; +import dji.sdk.products.Aircraft; +import dji.sdk.sdkmanager.DJISDKManager; +import dji.sdk.useraccount.UserAccountManager; +import sq.rogue.rosettadrone.R; +import sq.rogue.rosettadrone.RDApplication; + +public class Waypoint1Activity extends FragmentActivity implements View.OnClickListener, GoogleMap.OnMapClickListener, OnMapReadyCallback { + + protected static final String TAG = "GSDemoActivity"; + + private GoogleMap gMap; + + private Button locate, add, clear; + private Button config, upload, start, stop; + + private boolean isAdd = false; + + private double droneLocationLat = 181, droneLocationLng = 181; + private final Map mMarkers = new ConcurrentHashMap(); + private Marker droneMarker = null; + + private float altitude = 100.0f; + private float mSpeed = 10.0f; + + private List waypointList = new ArrayList<>(); + + public static WaypointMission.Builder waypointMissionBuilder; + private FlightController mFlightController; + private WaypointMissionOperator instance; + private WaypointMissionFinishedAction mFinishedAction = WaypointMissionFinishedAction.NO_ACTION; + private WaypointMissionHeadingMode mHeadingMode = WaypointMissionHeadingMode.AUTO; + + @Override + protected void onResume() { + super.onResume(); + initFlightController(); + } + + @Override + protected void onPause() { + super.onPause(); + } + + @Override + protected void onDestroy() { + unregisterReceiver(mReceiver); + removeListener(); + super.onDestroy(); + } + + /** + * @Description : RETURN Button RESPONSE FUNCTION + */ + public void onReturn(View view) { + Log.d(TAG, "onReturn"); + this.finish(); + } + + private void setResultToToast(final String string) { + Waypoint1Activity.this.runOnUiThread(new Runnable() { + @Override + public void run() { + Toast.makeText(Waypoint1Activity.this, string, Toast.LENGTH_SHORT).show(); + } + }); + } + + private void initUI() { + + locate = (Button) findViewById(R.id.locate); + add = (Button) findViewById(R.id.add); + clear = (Button) findViewById(R.id.clear); + config = (Button) findViewById(R.id.config); + upload = (Button) findViewById(R.id.upload); + start = (Button) findViewById(R.id.start); + stop = (Button) findViewById(R.id.stop); + + locate.setOnClickListener(this); + add.setOnClickListener(this); + clear.setOnClickListener(this); + config.setOnClickListener(this); + upload.setOnClickListener(this); + start.setOnClickListener(this); + stop.setOnClickListener(this); + + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + // When the compile and target version is higher than 22, please request the + // following permissions at runtime to ensure the + // SDK work well. + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + ActivityCompat.requestPermissions(this, + new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.VIBRATE, + Manifest.permission.INTERNET, Manifest.permission.ACCESS_WIFI_STATE, + Manifest.permission.WAKE_LOCK, Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_NETWORK_STATE, Manifest.permission.ACCESS_FINE_LOCATION, + Manifest.permission.CHANGE_WIFI_STATE, Manifest.permission.MOUNT_UNMOUNT_FILESYSTEMS, + Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.SYSTEM_ALERT_WINDOW, + Manifest.permission.READ_PHONE_STATE, + } + , 1); + } + + setContentView(R.layout.activity_waypoint1); + + IntentFilter filter = new IntentFilter(); + filter.addAction(RDApplication.FLAG_CONNECTION_CHANGE); + registerReceiver(mReceiver, filter); + + initUI(); + + SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager() + .findFragmentById(R.id.map); + mapFragment.getMapAsync(this); + + addListener(); + + } + + protected BroadcastReceiver mReceiver = new BroadcastReceiver() { + + @Override + public void onReceive(Context context, Intent intent) { + onProductConnectionChange(); + } + }; + + private void onProductConnectionChange() { + initFlightController(); + loginAccount(); + } + + private void loginAccount() { + + UserAccountManager.getInstance().logIntoDJIUserAccount(this, + new CommonCallbacks.CompletionCallbackWith() { + @Override + public void onSuccess(final UserAccountState userAccountState) { + Log.e(TAG, "Login Success"); + } + + @Override + public void onFailure(DJIError error) { + setResultToToast("Login Error:" + + error.getDescription()); + } + }); + } + + private void initFlightController() { + + BaseProduct product = RDApplication.getProductInstance(); + if (product != null && product.isConnected()) { + if (product instanceof Aircraft) { + mFlightController = ((Aircraft) product).getFlightController(); + } + } + + if (mFlightController != null) { + mFlightController.setStateCallback(new FlightControllerState.Callback() { + + @Override + public void onUpdate(FlightControllerState djiFlightControllerCurrentState) { + droneLocationLat = djiFlightControllerCurrentState.getAircraftLocation().getLatitude(); + droneLocationLng = djiFlightControllerCurrentState.getAircraftLocation().getLongitude(); + updateDroneLocation(); + } + }); + } + } + + //Add Listener for WaypointMissionOperator + private void addListener() { + if (getWaypointMissionOperator() != null) { + getWaypointMissionOperator().addListener(eventNotificationListener); + } + } + + private void removeListener() { + if (getWaypointMissionOperator() != null) { + getWaypointMissionOperator().removeListener(eventNotificationListener); + } + } + + private WaypointMissionOperatorListener eventNotificationListener = new WaypointMissionOperatorListener() { + @Override + public void onDownloadUpdate(WaypointMissionDownloadEvent downloadEvent) { + + } + + @Override + public void onUploadUpdate(WaypointMissionUploadEvent uploadEvent) { + + } + + @Override + public void onExecutionUpdate(WaypointMissionExecutionEvent executionEvent) { + + } + + @Override + public void onExecutionStart() { + + } + + @Override + public void onExecutionFinish(@Nullable final DJIError error) { + setResultToToast("Execution finished: " + (error == null ? "Success!" : error.getDescription())); + } + }; + + public WaypointMissionOperator getWaypointMissionOperator() { + if (instance == null) { + if (DJISDKManager.getInstance().getMissionControl() != null) { + instance = DJISDKManager.getInstance().getMissionControl().getWaypointMissionOperator(); + } + } + return instance; + } + + private void setUpMap() { + gMap.setOnMapClickListener(this);// add the listener for click for amap object + + } + + @Override + public void onMapClick(LatLng point) { + if (isAdd == true) { + markWaypoint(point); + Waypoint mWaypoint = new Waypoint(point.latitude, point.longitude, altitude); + //Add Waypoints to Waypoint arraylist; + if (waypointMissionBuilder != null) { + waypointList.add(mWaypoint); + waypointMissionBuilder.waypointList(waypointList).waypointCount(waypointList.size()); + } else { + waypointMissionBuilder = new WaypointMission.Builder(); + waypointList.add(mWaypoint); + waypointMissionBuilder.waypointList(waypointList).waypointCount(waypointList.size()); + } + } else { + setResultToToast("Cannot Add Waypoint"); + } + } + + public static boolean checkGpsCoordination(double latitude, double longitude) { + return (latitude > -90 && latitude < 90 && longitude > -180 && longitude < 180) && (latitude != 0f && longitude != 0f); + } + + // Update the drone location based on states from MCU. + private void updateDroneLocation() { + + LatLng pos = new LatLng(droneLocationLat, droneLocationLng); + //Create MarkerOptions object + final MarkerOptions markerOptions = new MarkerOptions(); + markerOptions.position(pos); + markerOptions.icon(BitmapDescriptorFactory.fromResource(R.drawable.aircraft)); + + runOnUiThread(new Runnable() { + @Override + public void run() { + if (droneMarker != null) { + droneMarker.remove(); + } + + if (checkGpsCoordination(droneLocationLat, droneLocationLng)) { + droneMarker = gMap.addMarker(markerOptions); + } + } + }); + } + + private void markWaypoint(LatLng point) { + //Create MarkerOptions object + MarkerOptions markerOptions = new MarkerOptions(); + markerOptions.position(point); + markerOptions.icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_BLUE)); + Marker marker = gMap.addMarker(markerOptions); + mMarkers.put(mMarkers.size(), marker); + } + + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.locate: { + updateDroneLocation(); + cameraUpdate(); // Locate the drone's place + break; + } + case R.id.add: { + enableDisableAdd(); + break; + } + case R.id.clear: { + runOnUiThread(new Runnable() { + @Override + public void run() { + gMap.clear(); + } + + }); + waypointList.clear(); + waypointMissionBuilder.waypointList(waypointList); + updateDroneLocation(); + break; + } + case R.id.config: { + showSettingDialog(); + break; + } + case R.id.upload: { + uploadWayPointMission(); + break; + } + case R.id.start: { + startWaypointMission(); + break; + } + case R.id.stop: { + stopWaypointMission(); + break; + } + default: + break; + } + } + + private void cameraUpdate() { + LatLng pos = new LatLng(droneLocationLat, droneLocationLng); + float zoomlevel = (float) 18.0; + CameraUpdate cu = CameraUpdateFactory.newLatLngZoom(pos, zoomlevel); + gMap.moveCamera(cu); + + } + + private void enableDisableAdd() { + if (isAdd == false) { + isAdd = true; + add.setText("Exit"); + } else { + isAdd = false; + add.setText("Add"); + } + } + + private void showSettingDialog() { + LinearLayout wayPointSettings = (LinearLayout) getLayoutInflater().inflate(R.layout.dialog_waypointsetting, null); + + final TextView wpAltitude_TV = (TextView) wayPointSettings.findViewById(R.id.altitude); + RadioGroup speed_RG = (RadioGroup) wayPointSettings.findViewById(R.id.speed); + RadioGroup actionAfterFinished_RG = (RadioGroup) wayPointSettings.findViewById(R.id.actionAfterFinished); + RadioGroup heading_RG = (RadioGroup) wayPointSettings.findViewById(R.id.heading); + + speed_RG.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { + + @Override + public void onCheckedChanged(RadioGroup group, int checkedId) { + if (checkedId == R.id.lowSpeed) { + mSpeed = 3.0f; + } else if (checkedId == R.id.MidSpeed) { + mSpeed = 5.0f; + } else if (checkedId == R.id.HighSpeed) { + mSpeed = 10.0f; + } + } + + }); + + actionAfterFinished_RG.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { + + @Override + public void onCheckedChanged(RadioGroup group, int checkedId) { + Log.d(TAG, "Select finish action"); + if (checkedId == R.id.finishNone) { + mFinishedAction = WaypointMissionFinishedAction.NO_ACTION; + } else if (checkedId == R.id.finishGoHome) { + mFinishedAction = WaypointMissionFinishedAction.GO_HOME; + } else if (checkedId == R.id.finishAutoLanding) { + mFinishedAction = WaypointMissionFinishedAction.AUTO_LAND; + } else if (checkedId == R.id.finishToFirst) { + mFinishedAction = WaypointMissionFinishedAction.GO_FIRST_WAYPOINT; + } + } + }); + + heading_RG.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { + + @Override + public void onCheckedChanged(RadioGroup group, int checkedId) { + Log.d(TAG, "Select heading"); + + if (checkedId == R.id.headingNext) { + mHeadingMode = WaypointMissionHeadingMode.AUTO; + } else if (checkedId == R.id.headingInitDirec) { + mHeadingMode = WaypointMissionHeadingMode.USING_INITIAL_DIRECTION; + } else if (checkedId == R.id.headingRC) { + mHeadingMode = WaypointMissionHeadingMode.CONTROL_BY_REMOTE_CONTROLLER; + } else if (checkedId == R.id.headingWP) { + mHeadingMode = WaypointMissionHeadingMode.USING_WAYPOINT_HEADING; + } + } + }); + + new AlertDialog.Builder(this) + .setTitle("") + .setView(wayPointSettings) + .setPositiveButton("Finish", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + String altitudeString = wpAltitude_TV.getText().toString(); + altitude = Integer.parseInt(nulltoIntegerDefalt(altitudeString)); + Log.e(TAG, "altitude " + altitude); + Log.e(TAG, "speed " + mSpeed); + Log.e(TAG, "mFinishedAction " + mFinishedAction); + Log.e(TAG, "mHeadingMode " + mHeadingMode); + configWayPointMission(); + } + + }) + .setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + dialog.cancel(); + } + + }) + .create() + .show(); + } + + String nulltoIntegerDefalt(String value) { + if (!isIntValue(value)) value = "0"; + return value; + } + + boolean isIntValue(String val) { + try { + val = val.replace(" ", ""); + Integer.parseInt(val); + } catch (Exception e) { + return false; + } + return true; + } + + private void configWayPointMission() { + + if (waypointMissionBuilder == null) { + + waypointMissionBuilder = new WaypointMission.Builder().finishedAction(mFinishedAction) + .headingMode(mHeadingMode) + .autoFlightSpeed(mSpeed) + .maxFlightSpeed(mSpeed) + .flightPathMode(WaypointMissionFlightPathMode.NORMAL); + + } else { + waypointMissionBuilder.finishedAction(mFinishedAction) + .headingMode(mHeadingMode) + .autoFlightSpeed(mSpeed) + .maxFlightSpeed(mSpeed) + .flightPathMode(WaypointMissionFlightPathMode.NORMAL); + + } + + if (waypointMissionBuilder.getWaypointList().size() > 0) { + + for (int i = 0; i < waypointMissionBuilder.getWaypointList().size(); i++) { + waypointMissionBuilder.getWaypointList().get(i).altitude = altitude; + } + + setResultToToast("Set Waypoint attitude successfully"); + } + + DJIError error = getWaypointMissionOperator().loadMission(waypointMissionBuilder.build()); + if (error == null) { + setResultToToast("loadWaypoint succeeded"); + } else { + setResultToToast("loadWaypoint failed " + error.getDescription()); + } + } + + private void uploadWayPointMission() { + + getWaypointMissionOperator().uploadMission(new CommonCallbacks.CompletionCallback() { + @Override + public void onResult(DJIError error) { + if (error == null) { + setResultToToast("Mission upload successfully!"); + } else { + setResultToToast("Mission upload failed, error: " + error.getDescription() + " retrying..."); + getWaypointMissionOperator().retryUploadMission(null); + } + } + }); + + } + + private void startWaypointMission() { + + getWaypointMissionOperator().startMission(new CommonCallbacks.CompletionCallback() { + @Override + public void onResult(DJIError error) { + setResultToToast("Mission Start: " + (error == null ? "Successfully" : error.getDescription())); + } + }); + } + + private void stopWaypointMission() { + + getWaypointMissionOperator().stopMission(new CommonCallbacks.CompletionCallback() { + @Override + public void onResult(DJIError error) { + setResultToToast("Mission Stop: " + (error == null ? "Successfully" : error.getDescription())); + } + }); + + } + + @Override + public void onMapReady(GoogleMap googleMap) { + if (gMap == null) { + gMap = googleMap; + setUpMap(); + } + + LatLng shenzhen = new LatLng(22.5362, 113.9454); + gMap.addMarker(new MarkerOptions().position(shenzhen).title("Marker in Shenzhen")); + gMap.moveCamera(CameraUpdateFactory.newLatLng(shenzhen)); + } + +} diff --git a/app/src/main/java/sq/rogue/rosettadrone/settings/Waypoint2Activity.java b/app/src/main/java/sq/rogue/rosettadrone/settings/Waypoint2Activity.java new file mode 100644 index 0000000..36f76f3 --- /dev/null +++ b/app/src/main/java/sq/rogue/rosettadrone/settings/Waypoint2Activity.java @@ -0,0 +1,791 @@ +package sq.rogue.rosettadrone.settings; + +import android.app.AlertDialog; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.IntentFilter; +import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.widget.Button; +import android.widget.LinearLayout; +import android.widget.RadioGroup; +import android.widget.TextView; +import android.widget.Toast; + +import com.google.android.gms.maps.CameraUpdate; +import com.google.android.gms.maps.CameraUpdateFactory; +import com.google.android.gms.maps.GoogleMap; +import com.google.android.gms.maps.OnMapReadyCallback; +import com.google.android.gms.maps.SupportMapFragment; +import com.google.android.gms.maps.model.BitmapDescriptorFactory; +import com.google.android.gms.maps.model.LatLng; +import com.google.android.gms.maps.model.Marker; +import com.google.android.gms.maps.model.MarkerOptions; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.concurrent.ConcurrentHashMap; + +import androidx.annotation.NonNull; +import androidx.fragment.app.FragmentActivity; +import dji.common.error.DJIError; +import dji.common.error.DJIWaypointV2Error; +import dji.common.flightcontroller.FlightControllerState; +import dji.common.flightcontroller.RTKState; +import dji.common.mission.waypoint.WaypointMissionHeadingMode; +import dji.common.mission.waypointv2.Action.WaypointV2Action; +import dji.common.mission.waypointv2.WaypointV2; +import dji.common.mission.waypointv2.WaypointV2Mission; +import dji.common.mission.waypointv2.WaypointV2MissionDownloadEvent; +import dji.common.mission.waypointv2.WaypointV2MissionExecutionEvent; +import dji.common.mission.waypointv2.WaypointV2MissionState; +import dji.common.mission.waypointv2.WaypointV2MissionTypes; +import dji.common.mission.waypointv2.WaypointV2MissionUploadEvent; +import dji.common.model.LocationCoordinate2D; +import dji.common.useraccount.UserAccountState; +import dji.common.util.CommonCallbacks; +import dji.sdk.base.BaseProduct; +import dji.sdk.flightcontroller.FlightController; +import dji.sdk.flightcontroller.RTK; +import dji.sdk.mission.MissionControl; +import dji.sdk.mission.waypoint.WaypointV2MissionOperator; +import dji.sdk.mission.waypoint.WaypointV2MissionOperatorListener; +import dji.sdk.products.Aircraft; +import dji.sdk.sdkmanager.DJISDKManager; +import dji.sdk.useraccount.UserAccountManager; +import sq.rogue.rosettadrone.R; +import sq.rogue.rosettadrone.RDApplication; + +public class Waypoint2Activity extends FragmentActivity implements View.OnClickListener, GoogleMap.OnMapClickListener, OnMapReadyCallback { + + protected static final String TAG = "Waypoint2Activity"; + + private GoogleMap gMap; + + private Button locate, add, clear; + private Button config, upload, start, stop; + + private boolean isAdd = false; + + private final Map mMarkers = new ConcurrentHashMap(); + private Marker droneMarker = null; + + private float altitude = 100.0f; + private float mSpeed = 10.0f; + + private List waypointList = new ArrayList<>(); + + public static WaypointV2Mission.Builder waypointMissionBuilder; + + private FlightController mFlightController; + private WaypointV2MissionOperator instance; + private WaypointV2MissionTypes.MissionFinishedAction mFinishedAction = WaypointV2MissionTypes.MissionFinishedAction.NO_ACTION; + private WaypointMissionHeadingMode mHeadingMode = WaypointMissionHeadingMode.AUTO; + private WaypointV2MissionTypes.MissionGotoWaypointMode firstMode = WaypointV2MissionTypes.MissionGotoWaypointMode.SAFELY; + private WaypointV2ActionDialog mActionDialog; + private List v2Actions; + private boolean canUploadAction; + private boolean canStartMission; + private double mHomeLat = 181; + private double mHomeLng = 181; + private double mAircraftLat = 181; + private double mAircraftLng = 181; + private boolean useRTKLocation = false; + private RTK mRtk; + private float droneHeading; + private float droneHeight; + + private TextView logTv; + + @Override + protected void onResume() { + super.onResume(); + initFlightController(); + } + + @Override + protected void onPause() { + super.onPause(); + } + + @Override + protected void onDestroy() { + unregisterReceiver(mReceiver); + removeListener(); + super.onDestroy(); + } + + /** + * @Description : RETURN Button RESPONSE FUNCTION + */ + public void onReturn(View view) { + Log.d(TAG, "onReturn"); + this.finish(); + } + + private void setResultToToast(final String string) { + Waypoint2Activity.this.runOnUiThread(new Runnable() { + @Override + public void run() { + Toast.makeText(Waypoint2Activity.this, string, Toast.LENGTH_SHORT).show(); + } + }); + } + + private void initUI() { + + locate = findViewById(R.id.locate); + add = findViewById(R.id.add); + clear = findViewById(R.id.clear); + config = findViewById(R.id.config); + upload = findViewById(R.id.upload); + start = findViewById(R.id.start); + stop = findViewById(R.id.stop); + logTv = findViewById(R.id.tv_log); + + locate.setOnClickListener(this); + add.setOnClickListener(this); + clear.setOnClickListener(this); + config.setOnClickListener(this); + upload.setOnClickListener(this); + start.setOnClickListener(this); + stop.setOnClickListener(this); + + findViewById(R.id.btn_add_action).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (isAdd) { + Toast.makeText(v.getContext(), "Adding waypoint!", Toast.LENGTH_SHORT).show(); + return; + } + if (waypointMissionBuilder == null || waypointMissionBuilder.getWaypointCount() == 0) { + Toast.makeText(v.getContext(), "Please add waypoint first!", Toast.LENGTH_SHORT).show(); + return; + } + if (mActionDialog == null) { + mActionDialog = new WaypointV2ActionDialog(); + mActionDialog.setActionCallback(actions -> { + v2Actions = actions; + Log.d("v2_action", "originSize=" + actions.size()); + }); + } + mActionDialog.setSize(waypointMissionBuilder.getWaypointCount()); + mActionDialog.show(getSupportFragmentManager(), "add_action"); + } + }); + + findViewById(R.id.btn_upload_action).setOnClickListener(this); + } + + private void initMapView() { + + if (gMap != null) { + gMap.setOnMapClickListener(this);// add the listener for click for amap object + } + + gMap.moveCamera(CameraUpdateFactory.zoomTo(18)); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + setContentView(R.layout.activity_waypoint2); + + IntentFilter filter = new IntentFilter(); + filter.addAction(RDApplication.FLAG_CONNECTION_CHANGE); + registerReceiver(mReceiver, filter); + + if (getWaypointMissionOperator() == null) { + setResultToToast("Not support Waypoint2.0"); + return; + } + + initUI(); + SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager() + .findFragmentById(R.id.map); + mapFragment.getMapAsync(this); + + addListener(); + onProductConnectionChange(); + setDroneLocationListener(); + + } + + private void setDroneLocationListener() { + if (mFlightController == null) { + Tools.showToast(this, "FC is null, comeback later!"); + return; + } + if (useRTKLocation) { + if ((mRtk = mFlightController.getRTK()) == null) { + Tools.showToast(this, "Not support RTK, use Flyc GPS!"); + mFlightController.setStateCallback(new FlightControllerState.Callback() { + @Override + public void onUpdate(FlightControllerState state) { + mHomeLat = state.getHomeLocation().getLatitude(); + mHomeLng = state.getHomeLocation().getLongitude(); + mAircraftLat = state.getAircraftLocation().getLatitude(); + mAircraftLng = state.getAircraftLocation().getLongitude(); + droneHeading = state.getAircraftHeadDirection(); + droneHeight = state.getAircraftLocation().getAltitude(); + } + }); + } else { + mFlightController.setStateCallback((new FlightControllerState.Callback() { + @Override + public void onUpdate(FlightControllerState state) { + mHomeLat = state.getHomeLocation().getLatitude(); + mHomeLng = state.getHomeLocation().getLongitude(); + } + })); + mRtk.setStateCallback(new RTKState.Callback() { + @Override + public void onUpdate(@NonNull RTKState state) { + mAircraftLat = state.getFusionMobileStationLocation().getLatitude(); + mAircraftLng = state.getFusionMobileStationLocation().getLongitude(); + droneHeading = state.getFusionHeading(); + droneHeight = state.getFusionMobileStationAltitude(); + updateDroneLocation(); + } + }); + } + } else { + if ((mRtk = mFlightController.getRTK()) != null) { + mFlightController.getRTK().setStateCallback(null); + } + mFlightController.setStateCallback(new FlightControllerState.Callback() { + @Override + public void onUpdate(FlightControllerState state) { + mHomeLat = state.getHomeLocation().getLatitude(); + mHomeLng = state.getHomeLocation().getLongitude(); + mAircraftLat = state.getAircraftLocation().getLatitude(); + mAircraftLng = state.getAircraftLocation().getLongitude(); + droneHeading = state.getAircraftHeadDirection(); + droneHeight = state.getAircraftLocation().getAltitude(); + updateDroneLocation(); + } + }); + } + } + + protected BroadcastReceiver mReceiver = new BroadcastReceiver() { + + @Override + public void onReceive(Context context, Intent intent) { + onProductConnectionChange(); + } + }; + + private void onProductConnectionChange() { + initFlightController(); + loginAccount(); + } + + private void loginAccount() { + + UserAccountManager.getInstance().logIntoDJIUserAccount(this, + new CommonCallbacks.CompletionCallbackWith() { + @Override + public void onSuccess(final UserAccountState userAccountState) { + Log.e(TAG, "Login Success"); + } + + @Override + public void onFailure(DJIError error) { + setResultToToast("Login Error:" + + error.getDescription()); + } + }); + } + + private void initFlightController() { + + BaseProduct product = RDApplication.getProductInstance(); + if (product != null && product.isConnected()) { + if (product instanceof Aircraft) { + mFlightController = ((Aircraft) product).getFlightController(); + } + } + } + + //Add Listener for WaypointMissionOperator + private void addListener() { + if (getWaypointMissionOperator() != null) { + getWaypointMissionOperator().addWaypointEventListener(eventNotificationListener); + } + } + + private void removeListener() { + if (getWaypointMissionOperator() != null) { + getWaypointMissionOperator().removeWaypointListener(eventNotificationListener); + } + } + + private WaypointV2MissionOperatorListener eventNotificationListener = new WaypointV2MissionOperatorListener() { + + @Override + public void onDownloadUpdate(WaypointV2MissionDownloadEvent waypointV2MissionDownloadEvent) { + + } + + @Override + public void onUploadUpdate(WaypointV2MissionUploadEvent uploadEvent) { + if (uploadEvent.getCurrentState() == WaypointV2MissionState.UPLOADING + || (uploadEvent.getError() != null)) { + // deal with the progress or the error info + } + + if (uploadEvent.getCurrentState() == WaypointV2MissionState.READY_TO_EXECUTE) { + // Can upload actions in it. + // getWaypointMissionOperator().uploadWaypointActions(); + canUploadAction = true; + } + if (uploadEvent.getPreviousState() == WaypointV2MissionState.UPLOADING + && uploadEvent.getCurrentState() == WaypointV2MissionState.READY_TO_EXECUTE) { + // upload complete, can start mission + // getWaypointMissionOperator().startMission(); + canStartMission = true; + } + + logTv.post(new Runnable() { + @Override + public void run() { + logTv.setText("cur_state:" + uploadEvent.getCurrentState().name()); + } + }); + } + + @Override + public void onExecutionUpdate(WaypointV2MissionExecutionEvent waypointV2MissionExecutionEvent) { + + } + + @Override + public void onExecutionStart() { + + } + + @Override + public void onExecutionFinish(DJIWaypointV2Error djiWaypointV2Error) { + + } + + @Override + public void onExecutionStopped() { + + } + }; + + public WaypointV2MissionOperator getWaypointMissionOperator() { + if (instance == null) { + MissionControl missionControl = DJISDKManager.getInstance().getMissionControl(); + if (missionControl != null) { + instance = missionControl.getWaypointMissionV2Operator(); + } + } + return instance; + } + + @Override + public void onMapClick(LatLng point) { + if (isAdd == true) { + markWaypoint(point); + WaypointV2 mWaypoint = new WaypointV2.Builder() + .setAltitude(altitude) + .setCoordinate(new LocationCoordinate2D(point.latitude, point.longitude)) + .build(); + //Add Waypoints to Waypoint arraylist; + if (waypointMissionBuilder != null) { + waypointList.add(mWaypoint); + waypointMissionBuilder.addWaypoint(mWaypoint); + } else { + waypointMissionBuilder = new WaypointV2Mission.Builder(); + waypointList.add(mWaypoint); + waypointMissionBuilder.addWaypoint(mWaypoint); + } + } else { + setResultToToast("Cannot Add Waypoint"); + } + } + + public static boolean checkGpsCoordination(double latitude, double longitude) { + return (latitude > -90 && latitude < 90 && longitude > -180 && longitude < 180) && (latitude != 0f && longitude != 0f); + } + + // Update the drone location based on states from MCU. + private void updateDroneLocation() { + + LatLng pos = new LatLng(mAircraftLat, mAircraftLng); + //Create MarkerOptions object + final MarkerOptions markerOptions = new MarkerOptions(); + markerOptions.position(pos); + markerOptions.icon(BitmapDescriptorFactory.fromResource(R.drawable.aircraft)); + + runOnUiThread(new Runnable() { + @Override + public void run() { + if (droneMarker != null) { + droneMarker.remove(); + } + + if (checkGpsCoordination(mAircraftLat, mAircraftLng)) { + droneMarker = gMap.addMarker(markerOptions); + droneMarker.setRotation(droneHeading * -1.0f); + } + } + }); + } + +// private void updateDroneLocation() { +// // Set the McuUpdateSateCallBack +// +// LatLng pos = new LatLng(mAircraftLat, mAircraftLng); +// final CameraUpdate cu = CameraUpdateFactory.changeLatLng(pos); +// //Create MarkerOptions object +// final MarkerOptions markerOptions = new MarkerOptions(); +// markerOptions.position(pos); +// markerOptions.icon(droneBitmap); +// markerOptions.anchor(0.5f, 0.5f); +// +// LatLng posHome = new LatLng(mHomeLat, mHomeLng); +// final MarkerOptions markerOptionsHomePoint = new MarkerOptions(); +// markerOptionsHomePoint.position(posHome); +// markerOptionsHomePoint.icon(homePointBitmap); +// markerOptionsHomePoint.anchor(0.5f, 0.5f); +// +// final double distance = Helper.distance(mAircraftLat, mAircraftLng, mHomeLat, mHomeLng); +// runOnUiThread(new Runnable() { +// @Override +// public void run() { +// if (mAircraftMarker != null) { +// mAircraftMarker.remove(); +// } +// if (Tools.checkGpsCoordination(mAircraftLat, mAircraftLng)) { +// mAircraftMarker = gMap.addMarker(markerOptions); +// mAircraftMarker.setRotateAngle(droneHeading * -1.0f); +// gMap.moveCamera(cu); +// } +// +// if (Tools.checkGpsCoordination(mHomeLat, mHomeLng)) { +// if (homePointMarker != null) { +// homePointMarker.remove(); +// } +// homePointMarker = gMap.addMarker(markerOptionsHomePoint); +// } +// distanceView.setText(String.format("distanceToHome:%.2f", distance) + "\n" +// + String.format("Heading:%.2f",droneHeading) + "\n" +// + String.format("Height:%.2f",droneHeight)); +// } +// }); +// } + + private void markWaypoint(LatLng point) { + //Create MarkerOptions object + MarkerOptions markerOptions = new MarkerOptions(); + markerOptions.position(point); + markerOptions.icon(BitmapDescriptorFactory.defaultMarker(BitmapDescriptorFactory.HUE_BLUE)); + Marker marker = gMap.addMarker(markerOptions); + mMarkers.put(mMarkers.size(), marker); + } + + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.locate: { + updateDroneLocation(); + cameraUpdate(); // Locate the drone's place + break; + } + case R.id.add: { + enableDisableAdd(); + break; + } + case R.id.clear: { + runOnUiThread(new Runnable() { + @Override + public void run() { + gMap.clear(); + if (waypointList != null) { + waypointList.clear(); + } + if (v2Actions != null) { + v2Actions.clear(); + } + } + + }); + + waypointMissionBuilder = null; + updateDroneLocation(); + break; + } + case R.id.config: { + showSettingDialog(); + break; + } + case R.id.upload: { + uploadWayPointMission(); + break; + } + case R.id.start: { + startWaypointMission(); + break; + } + case R.id.stop: { + stopWaypointMission(); + break; + } + case R.id.btn_upload_action: + if (!canUploadAction) { + setResultToToast("Can`t Upload action"); + return; + } + if (v2Actions == null || v2Actions.isEmpty()) { + setResultToToast("Please Add Actions"); + return; + } + getWaypointMissionOperator().uploadWaypointActions(v2Actions, new CommonCallbacks.CompletionCallback() { + @Override + public void onResult(DJIWaypointV2Error djiWaypointV2Error) { + if (djiWaypointV2Error == null) { + setResultToToast("Upload action success"); + } else { + setResultToToast("Upload action fail:" + djiWaypointV2Error.getDescription()); + } + } + }); + break; + default: + break; + } + } + + private void cameraUpdate() { + LatLng pos = new LatLng(mAircraftLat, mAircraftLng); + float zoomlevel = (float) 18.0; + CameraUpdate cu = CameraUpdateFactory.newLatLngZoom(pos, zoomlevel); + gMap.moveCamera(cu); + + } + + private void enableDisableAdd() { + if (isAdd == false) { + isAdd = true; + add.setText("Exit"); + } else { + isAdd = false; + add.setText("Add"); + } + } + + private void showSettingDialog() { + LinearLayout wayPointSettings = (LinearLayout) getLayoutInflater().inflate(R.layout.dialog_waypoint2setting, null); + + final TextView wpAltitude_TV = (TextView) wayPointSettings.findViewById(R.id.altitude); + RadioGroup speed_RG = (RadioGroup) wayPointSettings.findViewById(R.id.speed); + RadioGroup actionAfterFinished_RG = (RadioGroup) wayPointSettings.findViewById(R.id.actionAfterFinished); + RadioGroup heading_RG = (RadioGroup) wayPointSettings.findViewById(R.id.heading); + RadioGroup firstModeRg = wayPointSettings.findViewById(R.id.go_to_first_mode); + + firstModeRg.setOnCheckedChangeListener((group, checkedId) -> { + switch (checkedId) { + case R.id.rb_p2p: + firstMode = WaypointV2MissionTypes.MissionGotoWaypointMode.POINT_TO_POINT; + break; + case R.id.rb_safely: + firstMode = WaypointV2MissionTypes.MissionGotoWaypointMode.SAFELY; + break; + } + }); + + speed_RG.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { + + @Override + public void onCheckedChanged(RadioGroup group, int checkedId) { + if (checkedId == R.id.lowSpeed) { + mSpeed = 3.0f; + } else if (checkedId == R.id.MidSpeed) { + mSpeed = 5.0f; + } else if (checkedId == R.id.HighSpeed) { + mSpeed = 10.0f; + } + } + + }); + + actionAfterFinished_RG.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { + + @Override + public void onCheckedChanged(RadioGroup group, int checkedId) { + Log.d(TAG, "Select finish action"); + if (checkedId == R.id.finishNone) { + mFinishedAction = WaypointV2MissionTypes.MissionFinishedAction.NO_ACTION; + } else if (checkedId == R.id.finishGoHome) { + mFinishedAction = WaypointV2MissionTypes.MissionFinishedAction.GO_HOME; + } else if (checkedId == R.id.finishAutoLanding) { + mFinishedAction = WaypointV2MissionTypes.MissionFinishedAction.AUTO_LAND; + } else if (checkedId == R.id.finishToFirst) { + mFinishedAction = WaypointV2MissionTypes.MissionFinishedAction.GO_FIRST_WAYPOINT; + } +// else if (checkedId == R.id.untilStop) { +// mFinishedAction = WaypointV2MissionTypes.MissionFinishedAction.CONTINUE_UNTIL_STOP; +// } + } + }); + + heading_RG.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() { + + @Override + public void onCheckedChanged(RadioGroup group, int checkedId) { + Log.d(TAG, "Select heading"); + + if (checkedId == R.id.headingNext) { + mHeadingMode = WaypointMissionHeadingMode.AUTO; + } else if (checkedId == R.id.headingInitDirec) { + mHeadingMode = WaypointMissionHeadingMode.USING_INITIAL_DIRECTION; + } else if (checkedId == R.id.headingRC) { + mHeadingMode = WaypointMissionHeadingMode.CONTROL_BY_REMOTE_CONTROLLER; + } else if (checkedId == R.id.headingWP) { + mHeadingMode = WaypointMissionHeadingMode.USING_WAYPOINT_HEADING; + } + } + }); + + new AlertDialog.Builder(this) + .setTitle("") + .setView(wayPointSettings) + .setPositiveButton("Finish", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int id) { + + String altitudeString = wpAltitude_TV.getText().toString(); + altitude = Integer.parseInt(nulltoIntegerDefalt(altitudeString)); + Log.e(TAG, "altitude " + altitude); + Log.e(TAG, "speed " + mSpeed); + Log.e(TAG, "mFinishedAction " + mFinishedAction); + Log.e(TAG, "mHeadingMode " + mHeadingMode); + configWayPointMission(); + } + + }) + .setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int id) { + dialog.cancel(); + } + + }) + .create() + .show(); + } + + String nulltoIntegerDefalt(String value) { + if (!isIntValue(value)) { + value = "0"; + } + return value; + } + + boolean isIntValue(String val) { + try { + val = val.replace(" ", ""); + Integer.parseInt(val); + } catch (Exception e) { + return false; + } + return true; + } + + private void configWayPointMission() { + + if (waypointMissionBuilder == null) { +// waypointMissionBuilder = new WaypointMission.Builder().finishedAction(mFinishedAction) +// .headingMode(mHeadingMode) +// .autoFlightSpeed(mSpeed) +// .maxFlightSpeed(mSpeed) +// .flightPathMode(WaypointMissionFlightPathMode.NORMAL); + waypointMissionBuilder = new WaypointV2Mission.Builder(); + + } + waypointMissionBuilder.setFinishedAction(mFinishedAction) + .setMissionID(new Random().nextInt(65535)) + .setFinishedAction(mFinishedAction) + .setGotoFirstWaypointMode(firstMode) + .setMaxFlightSpeed(mSpeed) + .setAutoFlightSpeed(mSpeed); + + getWaypointMissionOperator().loadMission(waypointMissionBuilder.build(), new CommonCallbacks.CompletionCallback() { + @Override + public void onResult(DJIWaypointV2Error error) { + if (error == null) { + setResultToToast("loadWaypoint succeeded"); + canUpload = true; + } else { + setResultToToast("loadWaypoint failed " + error.getDescription()); + } + + } + }); + + + } + + boolean canUpload = false; + + private void uploadWayPointMission() { + if (!canUpload) { + Toast.makeText(this, "please click 'CONFIG' button first", Toast.LENGTH_SHORT).show(); + return; + } + getWaypointMissionOperator().uploadMission(new CommonCallbacks.CompletionCallback() { + @Override + public void onResult(DJIError error) { + if (error == null) { + setResultToToast("Mission upload successfully!"); + } else { + setResultToToast("Mission upload failed, error: " + error.getDescription()); + } + } + }); + + } + + private void startWaypointMission() { + + getWaypointMissionOperator().startMission(new CommonCallbacks.CompletionCallback() { + @Override + public void onResult(DJIError error) { + setResultToToast("Mission Start: " + (error == null ? "Successfully" : error.getDescription())); + } + }); + + } + + private void stopWaypointMission() { + + getWaypointMissionOperator().stopMission(new CommonCallbacks.CompletionCallback() { + @Override + public void onResult(DJIError error) { + setResultToToast("Mission Stop: " + (error == null ? "Successfully" : error.getDescription())); + } + }); + + } + + @Override + public void onMapReady(GoogleMap googleMap) { + if (gMap == null) { + gMap = googleMap; + initMapView(); + } + +// gMap.addMarker(new MarkerOptions().position(shenzhen).title("Marker in Shenzhen")); +// gMap.moveCamera(CameraUpdateFactory.newLatLng(shenzhen)); + } +} diff --git a/app/src/main/java/sq/rogue/rosettadrone/settings/WaypointActionAdapter.java b/app/src/main/java/sq/rogue/rosettadrone/settings/WaypointActionAdapter.java new file mode 100644 index 0000000..f2aa1f0 --- /dev/null +++ b/app/src/main/java/sq/rogue/rosettadrone/settings/WaypointActionAdapter.java @@ -0,0 +1,73 @@ +package sq.rogue.rosettadrone.settings; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import java.util.List; + +import androidx.recyclerview.widget.RecyclerView; +import dji.common.mission.waypointv2.Action.WaypointV2Action; +import sq.rogue.rosettadrone.R; + +public class WaypointActionAdapter extends RecyclerView.Adapter { + private List data; + private LayoutInflater mInflater; + + public WaypointActionAdapter(Context context, List data) { + this.mInflater = LayoutInflater.from(context); + this.data = data; + } + + public void addItem(WaypointV2Action action) { + if (action == null || data == null) { + return; + } + data.add(action); + notifyItemInserted(getItemCount() - 1); + } + + public List getData() { + return data; + } + + @Override + public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + return new ViewHolder(mInflater.inflate(R.layout.item_waypoint_action, parent, false)); + } + + @Override + public void onBindViewHolder(ViewHolder holder, int position) { + holder.setData(data.get(position)); + } + + @Override + public int getItemCount() { + return data == null ? 0 : data.size(); + } + + public class ViewHolder extends RecyclerView.ViewHolder { + private TextView triggerTv; + private TextView actuatorTv; + private TextView actionIdTv; + + public ViewHolder(View itemView) { + super(itemView); + triggerTv = itemView.findViewById(R.id.tv_trigger); + actuatorTv = itemView.findViewById(R.id.tv_actuator); + actionIdTv = itemView.findViewById(R.id.tv_action_id); + } + + public void setData(WaypointV2Action data) { + if (data.getTrigger() != null) { + triggerTv.setText("Trigger: " + data.getTrigger().getTriggerType().name()); + } + if (data.getActuator() != null) { + actuatorTv.setText("Actuator: " + data.getActuator().getActuatorType().name()); + } + actionIdTv.setText("ActionId:" + data.getActionID()); + } + } +} diff --git a/app/src/main/java/sq/rogue/rosettadrone/settings/WaypointV2ActionDialog.java b/app/src/main/java/sq/rogue/rosettadrone/settings/WaypointV2ActionDialog.java new file mode 100644 index 0000000..44a9132 --- /dev/null +++ b/app/src/main/java/sq/rogue/rosettadrone/settings/WaypointV2ActionDialog.java @@ -0,0 +1,437 @@ +package sq.rogue.rosettadrone.settings; + +import android.os.Bundle; +import android.util.DisplayMetrics; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.FrameLayout; +import android.widget.LinearLayout; +import android.widget.TextView; + +import java.util.ArrayList; +import java.util.List; + +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatSpinner; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.core.widget.NestedScrollView; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.OnClick; +import butterknife.Unbinder; +import dji.common.mission.waypointv2.Action.ActionTypes; +import dji.common.mission.waypointv2.Action.WaypointActuator; +import dji.common.mission.waypointv2.Action.WaypointTrigger; +import dji.common.mission.waypointv2.Action.WaypointV2Action; +import sq.rogue.rosettadrone.R; +import sq.rogue.rosettadrone.fragment.actuator.AircraftActuatorFragment; +import sq.rogue.rosettadrone.fragment.actuator.CameraActuatorFragment; +import sq.rogue.rosettadrone.fragment.actuator.GimbalActuatorFragment; +import sq.rogue.rosettadrone.fragment.actuator.IActuatorCallback; +import sq.rogue.rosettadrone.fragment.trigger.AssociateTriggerFragment; +import sq.rogue.rosettadrone.fragment.trigger.BaseTriggerFragment; +import sq.rogue.rosettadrone.fragment.trigger.ITriggerCallback; +import sq.rogue.rosettadrone.fragment.trigger.ReachPointTriggerFragment; +import sq.rogue.rosettadrone.fragment.trigger.SimpleIntervalTriggerFragment; +import sq.rogue.rosettadrone.fragment.trigger.TrajectoryTriggerFragment; + +public class WaypointV2ActionDialog extends DialogFragment implements ITriggerCallback { + @BindView(R.id.tv_title) + TextView tvTitle; + @BindView(R.id.view_division) + View viewDivision; + @BindView(R.id.rv_added_action) + RecyclerView rvAddedAction; + @BindView(R.id.nsv_action_detail) + NestedScrollView nsvActionDetail; + @BindView(R.id.tv_ok) + TextView tvOk; + Unbinder unbinder; + @BindView(R.id.tv_trigger_title) + TextView tvTriggerTitle; + @BindView(R.id.cl_trigger) + ConstraintLayout clTrigger; + @BindView(R.id.spinner_trigger_type) + AppCompatSpinner spinnerTriggerType; + @BindView(R.id.fl_trigger_info) + FrameLayout flTriggerInfo; + @BindView(R.id.tv_actuator_title) + TextView tvActuatorTitle; + @BindView(R.id.spinner_actuator_type) + AppCompatSpinner spinnerActuatorType; + @BindView(R.id.fl_actuator_info) + FrameLayout flActuatorInfo; + + private WaypointActionAdapter actionAdapter; + + List triggerType; + List actuatorType; + List actuatorNames; + + private AssociateTriggerFragment associateTriggerFragment; + private SimpleIntervalTriggerFragment simpleIntervalTriggerFragment; + private ReachPointTriggerFragment reachPointTriggerFragment; + private TrajectoryTriggerFragment trajectoryTriggerFragment; + + private AircraftActuatorFragment aircraftActuatorFragment; + private CameraActuatorFragment cameraActuatorFragment; + private GimbalActuatorFragment gimbalActuatorFragment; + + private Fragment currentTriggerFragment; + private Fragment currentActuatorFragment; + + private IActionCallback actionCallback; + ArrayAdapter actuatorAdapter; + + private int position; + private int size; + + + public void setActionCallback(IActionCallback actionCallback) { + this.actionCallback = actionCallback; + } + + public void setSize(int size) { + this.size = size; + } + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + View root = inflater.inflate(R.layout.dialog_waypoint_v2, container, false); + unbinder = ButterKnife.bind(this, root); + initData(); + initView(); + return root; + } + + private void initData() { + triggerType = new ArrayList<>(); + actuatorType = new ArrayList<>(); + triggerType.add("Please select trigger type"); + for (ActionTypes.ActionTriggerType type : ActionTypes.ActionTriggerType.values()) { + if (type == ActionTypes.ActionTriggerType.COMPLEX_REACH_POINTS) { + // not support + continue; + } + triggerType.add(type.name()); + } + actuatorNames = new ArrayList(); + actuatorNames.add("Please select actuator type"); + actuatorNames.add(ActionTypes.ActionActuatorType.GIMBAL.name()); + actuatorNames.add(ActionTypes.ActionActuatorType.CAMERA.name()); + actuatorNames.add(ActionTypes.ActionActuatorType.AIRCRAFT_CONTROL.name()); + actuatorType.addAll(actuatorNames); + } + + private void initView() { + rvAddedAction.setLayoutManager(new LinearLayoutManager(getContext())); + rvAddedAction.addItemDecoration(new DividerItemDecoration(getContext(), LinearLayout.HORIZONTAL)); + + actionAdapter = new WaypointActionAdapter(getContext(), new ArrayList<>()); + rvAddedAction.setAdapter(actionAdapter); + + ArrayAdapter triggerAdapter = new ArrayAdapter(getActivity(), + android.R.layout.simple_spinner_dropdown_item, triggerType); + spinnerTriggerType.setAdapter(triggerAdapter); + spinnerTriggerType.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView parent, View view, int position, long id) { + if (position == 0) { + hideTriggerFragment(); + return; + } + switch (ActionTypes.ActionTriggerType.valueOf(triggerType.get(position))) { + case ASSOCIATE: + if (associateTriggerFragment == null) { + associateTriggerFragment = AssociateTriggerFragment.newInstance(); + } + associateTriggerFragment.setSize(actionAdapter.getData().size()); + showFragment(associateTriggerFragment, R.id.fl_trigger_info); + currentTriggerFragment = associateTriggerFragment; + break; + case SIMPLE_INTERVAL: + if (simpleIntervalTriggerFragment == null) { + simpleIntervalTriggerFragment = SimpleIntervalTriggerFragment.newInstance(); + } + simpleIntervalTriggerFragment.setSize(size); + showFragment(simpleIntervalTriggerFragment, R.id.fl_trigger_info); + currentTriggerFragment = simpleIntervalTriggerFragment; + break; + case REACH_POINT: + if (reachPointTriggerFragment == null) { + reachPointTriggerFragment = ReachPointTriggerFragment.newInstance(); + } + reachPointTriggerFragment.setSize(size); + showFragment(reachPointTriggerFragment, R.id.fl_trigger_info); + currentTriggerFragment = reachPointTriggerFragment; + break; + case TRAJECTORY: + if (trajectoryTriggerFragment == null) { + trajectoryTriggerFragment = TrajectoryTriggerFragment.newInstance(); + } + trajectoryTriggerFragment.setSize(size); + showFragment(trajectoryTriggerFragment, R.id.fl_trigger_info); + currentTriggerFragment = trajectoryTriggerFragment; + break; + case UNKNOWN: + hideTriggerFragment(); + break; + } + hideActuatorFragment(); + changeActuatorAdapter(ActionTypes.ActionTriggerType.valueOf(triggerType.get(position))); + } + + @Override + public void onNothingSelected(AdapterView parent) { + + } + }); + actuatorAdapter = new ArrayAdapter(getActivity(), + android.R.layout.simple_spinner_dropdown_item, actuatorType); + spinnerActuatorType.setAdapter(actuatorAdapter); + spinnerActuatorType.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView parent, View view, int position, long id) { + if (position == 0) { + hideActuatorFragment(); + return; + } + switch (ActionTypes.ActionActuatorType.valueOf(actuatorType.get(position))) { + case SPRAY: + // 暂不支持 + Tools.showToast(getActivity(), "Not Support"); + hideActuatorFragment(); + break; + case CAMERA: + if (cameraActuatorFragment == null) { + cameraActuatorFragment = CameraActuatorFragment.newInstance(); + } + showFragment(cameraActuatorFragment, R.id.fl_actuator_info); + currentActuatorFragment = cameraActuatorFragment; + break; + case PLAYLOAD: + Tools.showToast(getActivity(), "Not Support"); + hideActuatorFragment(); + break; + case GIMBAL: + if (gimbalActuatorFragment == null) { + gimbalActuatorFragment = GimbalActuatorFragment.newInstance(WaypointV2ActionDialog.this); + } + showFragment(gimbalActuatorFragment, R.id.fl_actuator_info); + currentActuatorFragment = gimbalActuatorFragment; + gimbalActuatorFragment.flush(); + break; + case AIRCRAFT_CONTROL: + if (aircraftActuatorFragment == null) { + aircraftActuatorFragment = AircraftActuatorFragment.newInstance(); + } + showFragment(aircraftActuatorFragment, R.id.fl_actuator_info); + currentActuatorFragment = aircraftActuatorFragment; + break; + case NAVIGATION: + Tools.showToast(getActivity(), "Not Support"); + hideActuatorFragment(); + break; + case UNKNOWN: + hideActuatorFragment(); + break; + } + } + + @Override + public void onNothingSelected(AdapterView parent) { + + } + }); + } + + private void changeActuatorAdapter(ActionTypes.ActionTriggerType triggerType) { + switch (triggerType) { + case COMPLEX_REACH_POINTS: + flushActuator(); + break; + case ASSOCIATE: + flushActuator(); + break; + case SIMPLE_INTERVAL: + flushActuator(); + break; + case REACH_POINT: + flushActuator(); + break; + case TRAJECTORY: + // this trigger is one by one with ActionTypes.GimbalOperationType#AIRCRAFT_CONTROL_GIMBAL. + actuatorType.removeAll(actuatorNames); + actuatorType.add("Please select actuator type"); + actuatorType.add(ActionTypes.ActionActuatorType.GIMBAL.name()); + break; + default: + break; + } + } + + private void flushActuator() { + actuatorType.clear(); + actuatorType.addAll(actuatorNames); + actionAdapter.notifyDataSetChanged(); + } + + private void hideActuatorFragment() { + if (currentActuatorFragment == null) { + return; + } + FragmentTransaction transaction = getChildFragmentManager().beginTransaction(); + transaction.hide(currentActuatorFragment); + transaction.commit(); + } + + + private void showFragment(Fragment fragment, @IdRes int id) { + if (fragment == null || fragment.isVisible()) { + return; + } + + FragmentTransaction transaction = getChildFragmentManager().beginTransaction(); + if (fragment.isAdded()) { + if (fragment instanceof BaseTriggerFragment && currentTriggerFragment != null) { + transaction.hide(currentTriggerFragment); + } else if (fragment instanceof IActuatorCallback && currentActuatorFragment != null) { + transaction.hide(currentActuatorFragment); + } + transaction.show(fragment); + } else { + transaction.replace(id, fragment); + } + transaction.commit(); + } + + private void hideTriggerFragment() { + if (currentTriggerFragment == null) { + return; + } + FragmentTransaction transaction = getChildFragmentManager().beginTransaction(); + transaction.hide(currentTriggerFragment); + transaction.commit(); + } + + @Override + public void onStart() { + super.onStart(); + DisplayMetrics dm = new DisplayMetrics(); + getActivity().getWindowManager().getDefaultDisplay().getMetrics(dm); + getDialog().getWindow().setLayout((int) (dm.widthPixels * 0.9), (int) (dm.heightPixels * 0.9)); + + } + + @Override + public void onDestroyView() { + super.onDestroyView(); + unbinder.unbind(); + } + + @OnClick({R.id.tv_ok, R.id.tv_add}) + public void onViewClick(View v) { + switch (v.getId()) { + case R.id.tv_ok: + if (actionCallback != null) { + actionCallback.getActions(actionAdapter.getData()); + } + dismiss(); + position = 0; + break; + case R.id.tv_add: + WaypointTrigger trigger = getWaypointTrigger(); + WaypointActuator actuator = getWaypointActuator(); + boolean result = verifyAction(trigger, actuator); + if (!result) { + break; + } + WaypointV2Action action = new WaypointV2Action.Builder() + .setTrigger(trigger) + .setActuator(actuator) + .setActionID(++position) + .build(); + actionAdapter.addItem(action); + updateSize(); + break; + } + } + + private boolean verifyAction(WaypointTrigger trigger, WaypointActuator actuator) { + if (trigger == null || actuator == null) { + Tools.showToast(getActivity(), "add fail"); + return false; + } + if (actuator.getActuatorType() == ActionTypes.ActionActuatorType.GIMBAL + && actuator.getGimbalActuatorParam().getOperationType() == ActionTypes.GimbalOperationType.AIRCRAFT_CONTROL_GIMBAL) { + if (trigger.getTriggerType() != ActionTypes.ActionTriggerType.TRAJECTORY) { + Tools.showToast(getActivity(), "this trigger `TRAJECTORY` is one by one with `ActionTypes.GimbalOperationType.AIRCRAFT_CONTROL_GIMBAL`"); + return false; + } + } + if (trigger.getTriggerType() == ActionTypes.ActionTriggerType.TRAJECTORY) { + if (actuator.getActuatorType() != ActionTypes.ActionActuatorType.GIMBAL + || actuator.getGimbalActuatorParam().getOperationType() != ActionTypes.GimbalOperationType.AIRCRAFT_CONTROL_GIMBAL) { + Tools.showToast(getActivity(), "this trigger `TRAJECTORY` is one by one with `ActionTypes.GimbalOperationType.AIRCRAFT_CONTROL_GIMBAL`"); + return false; + } + } + return true; + } + + private void updateSize() { + if (reachPointTriggerFragment != null) { + reachPointTriggerFragment.setSize(actionAdapter.getItemCount()); + } + if (associateTriggerFragment != null) { + associateTriggerFragment.setSize(actionAdapter.getItemCount()); + } + if (simpleIntervalTriggerFragment != null) { + simpleIntervalTriggerFragment.setSize(actionAdapter.getItemCount()); + } + if (trajectoryTriggerFragment != null) { + trajectoryTriggerFragment.setSize(actionAdapter.getItemCount()); + } + } + + private WaypointActuator getWaypointActuator() { + if (currentActuatorFragment == null) { + return null; + } + if (currentActuatorFragment instanceof IActuatorCallback) { + return ((IActuatorCallback) currentActuatorFragment).getActuator(); + } + return null; + } + + private WaypointTrigger getWaypointTrigger() { + if (currentTriggerFragment == null) { + return null; + } + if (currentTriggerFragment instanceof ITriggerCallback) { + return ((ITriggerCallback) currentTriggerFragment).getTrigger(); + } + return null; + } + + @Override + public WaypointTrigger getTrigger() { + return getWaypointTrigger(); + } + + public interface IActionCallback { + void getActions(List actions); + } +} diff --git a/app/src/main/java/sq/rogue/rosettadrone/settings/drone/DroneSettingsFragment.java b/app/src/main/java/sq/rogue/rosettadrone/settings/drone/DroneSettingsFragment.java index 4f702bc..61e3001 100644 --- a/app/src/main/java/sq/rogue/rosettadrone/settings/drone/DroneSettingsFragment.java +++ b/app/src/main/java/sq/rogue/rosettadrone/settings/drone/DroneSettingsFragment.java @@ -2,13 +2,13 @@ package sq.rogue.rosettadrone.settings.drone; import android.content.SharedPreferences; import android.os.Bundle; + +import java.util.Map; + import androidx.preference.EditTextPreference; import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; - -import java.util.Map; - import sq.rogue.rosettadrone.MainActivity; import sq.rogue.rosettadrone.NotificationHandler; import sq.rogue.rosettadrone.R; diff --git a/app/src/main/java/sq/rogue/rosettadrone/video/H264Packetizer.java b/app/src/main/java/sq/rogue/rosettadrone/video/H264Packetizer.java index 59cc42e..f092c55 100755 --- a/app/src/main/java/sq/rogue/rosettadrone/video/H264Packetizer.java +++ b/app/src/main/java/sq/rogue/rosettadrone/video/H264Packetizer.java @@ -22,7 +22,6 @@ import android.annotation.SuppressLint; import android.util.Log; import java.io.IOException; -import java.net.InetAddress; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -176,7 +175,7 @@ public class H264Packetizer extends AbstractPacketizer implements Runnable { // The stream already contains NAL unit type 7 or 8, we don't need // to add them to the stream ourselves if (type == 7 || type == 8) { - // Log.v(TAG, "SPS or PPS present in the stream."); + // Log.v(TAG, "SPS or PPS present in the stream."); count++; if (count > 4) { sps = null; @@ -192,7 +191,7 @@ public class H264Packetizer extends AbstractPacketizer implements Runnable { socket.updateTimestamp(ts); System.arraycopy(stapa, 0, buffer, rtphl, stapa.length); super.send(rtphl + stapa.length); - // Log.e(TAG,"----- NAL unit - len:"+len+" delay: "+delay); + // Log.e(TAG,"----- NAL unit - len:"+len+" delay: "+delay); } @@ -206,7 +205,7 @@ public class H264Packetizer extends AbstractPacketizer implements Runnable { socket.updateTimestamp(ts); socket.markNextPacket(); super.send(naluLength + rtphl); - // Log.e(TAG,"----- Single NAL unit - len:"+len+" delay: "+delay); + // Log.e(TAG,"----- Single NAL unit - len:"+len+" delay: "+delay); } // Large NAL unit => Split nal unit else { @@ -235,7 +234,7 @@ public class H264Packetizer extends AbstractPacketizer implements Runnable { super.send(len + rtphl + 2); // Switch start bit header[1] = (byte) (header[1] & 0x7F); - // Log.e(TAG,"----- FU-A unit, sum:"+sum); + // Log.e(TAG,"----- FU-A unit, sum:"+sum); } } } diff --git a/app/src/main/java/sq/rogue/rosettadrone/video/RtpSocket.java b/app/src/main/java/sq/rogue/rosettadrone/video/RtpSocket.java index 368515a..4dc6f9a 100755 --- a/app/src/main/java/sq/rogue/rosettadrone/video/RtpSocket.java +++ b/app/src/main/java/sq/rogue/rosettadrone/video/RtpSocket.java @@ -54,8 +54,8 @@ public class RtpSocket implements Runnable { public static final int RTP_HEADER_LENGTH = 12; public static final int MTU = 1300; public MulticastSocket mSocket; - public DatagramSocket mSocketUDP; - public DatagramSocket mSocketUDP2; + public DatagramSocket mSocketUDP; + public DatagramSocket mSocketUDP2; protected OutputStream mOutputStream = null; private DatagramPacket[] mPackets; private byte[][] mBuffers; @@ -201,7 +201,7 @@ public class RtpSocket implements Runnable { if (dport != 0 && rtcpPort != 0) { mTransport = TRANSPORT_UDP; mPort = dport; - Log.d(TAG, "setDestination: " +dest +":"+dport ); + Log.d(TAG, "setDestination: " + dest + ":" + dport); for (int i = 0; i < mBufferCount; i++) { mPackets[i].setPort(dport); mPackets[i].setAddress(dest); @@ -348,14 +348,13 @@ public class RtpSocket implements Runnable { mOldTimestamp = mTimestamps[mBufferOut]; if (mCount++ > 30) { if (mTransport == TRANSPORT_UDP) { - if(mUseDualVideoOut) { + if (mUseDualVideoOut) { mPackets[mBufferOut].setPort(mPort); mSocketUDP.send(mPackets[mBufferOut]); mPackets[mBufferOut].setPort(mPort + 1); mSocketUDP2.send(mPackets[mBufferOut]); - } - else{ + } else { mSocketUDP.send(mPackets[mBufferOut]); } } else { diff --git a/app/src/main/java/sq/rogue/rosettadrone/video/VideoService.java b/app/src/main/java/sq/rogue/rosettadrone/video/VideoService.java index 42c6781..4015d85 100644 --- a/app/src/main/java/sq/rogue/rosettadrone/video/VideoService.java +++ b/app/src/main/java/sq/rogue/rosettadrone/video/VideoService.java @@ -15,8 +15,6 @@ import android.graphics.Color; import android.os.Binder; import android.os.Build; import android.os.IBinder; -import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; import android.util.Log; import java.io.ByteArrayInputStream; @@ -24,6 +22,9 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Arrays; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; + public class VideoService extends Service implements NativeHelper.NativeDataListener { private static final String TAG = VideoService.class.getSimpleName(); @@ -50,6 +51,7 @@ public class VideoService extends Service implements NativeHelper.NativeDataList initVideoStreamDecoder(); super.onCreate(); } + @Override public void onDestroy() { setActionDroneDisconnected(); @@ -79,16 +81,16 @@ public class VideoService extends Service implements NativeHelper.NativeDataList return channelID; } - public void setParameters(String ip, int videoPort, int videoBitrate, int encodeSpeed){ + public void setParameters(String ip, int videoPort, int videoBitrate, int encodeSpeed) { Log.e(TAG, "setParameters"); mip = ip; - mvideoPort= videoPort; + mvideoPort = videoPort; mvideoBitrate = videoBitrate; mencodeSpeed = encodeSpeed; initPacketizer(mip, mvideoPort, mvideoBitrate, mencodeSpeed); } - public void setDualVideo(boolean dualVideo){ + public void setDualVideo(boolean dualVideo) { mPacketizer.socket.UseDualVideo(dualVideo); } @@ -157,9 +159,13 @@ public class VideoService extends Service implements NativeHelper.NativeDataList //--------------------------------------------------------------------------------------- @Override public void onDataRecv(byte[] data, int size, int frameNum, boolean isKeyFrame, int width, int height) { - if(size > 0 && isRunning) { + if (size > 0 && isRunning) { // Pack the raw H.264 stream... - splitNALs(data); + try { + splitNALs(data); + } catch (Exception e){ + Log.d("VideoService",Log.getStackTraceString(e)); + } } } } diff --git a/app/src/main/res/.DS_Store b/app/src/main/res/.DS_Store index 9a0b6b9..2786c92 100644 Binary files a/app/src/main/res/.DS_Store and b/app/src/main/res/.DS_Store differ diff --git a/app/src/main/res/color/nav_text.xml b/app/src/main/res/color/nav_text.xml index 0890e64..b05cbd9 100644 --- a/app/src/main/res/color/nav_text.xml +++ b/app/src/main/res/color/nav_text.xml @@ -1,9 +1,9 @@ - + - + \ No newline at end of file diff --git a/app/src/main/res/drawable-anydpi-v24/uxsdk_ic_map_gimbal_yaw.xml b/app/src/main/res/drawable-anydpi-v24/uxsdk_ic_map_gimbal_yaw.xml index 95988f3..4b6853b 100644 --- a/app/src/main/res/drawable-anydpi-v24/uxsdk_ic_map_gimbal_yaw.xml +++ b/app/src/main/res/drawable-anydpi-v24/uxsdk_ic_map_gimbal_yaw.xml @@ -27,20 +27,24 @@ android:height="88dp" android:viewportWidth="46" android:viewportHeight="114"> - - - - - - - - + + + + + + + + diff --git a/app/src/main/res/drawable-hdpi/ic_down_arrow_white_24dp.xml b/app/src/main/res/drawable-hdpi/ic_down_arrow_white_24dp.xml index 23f4d7a..62b315e 100644 --- a/app/src/main/res/drawable-hdpi/ic_down_arrow_white_24dp.xml +++ b/app/src/main/res/drawable-hdpi/ic_down_arrow_white_24dp.xml @@ -1,4 +1,9 @@ - - + + diff --git a/app/src/main/res/drawable-hdpi/ic_drone.xml b/app/src/main/res/drawable-hdpi/ic_drone.xml index 5b94b0e..cf7906e 100644 --- a/app/src/main/res/drawable-hdpi/ic_drone.xml +++ b/app/src/main/res/drawable-hdpi/ic_drone.xml @@ -1,8 +1,21 @@ - - - - - - + + + + + + diff --git a/app/src/main/res/drawable-hdpi/ic_lock_outline_secondary_24dp.xml b/app/src/main/res/drawable-hdpi/ic_lock_outline_secondary_24dp.xml index 1680a2a..013eead 100644 --- a/app/src/main/res/drawable-hdpi/ic_lock_outline_secondary_24dp.xml +++ b/app/src/main/res/drawable-hdpi/ic_lock_outline_secondary_24dp.xml @@ -1,5 +1,10 @@ - - + + diff --git a/app/src/main/res/drawable-hdpi/ic_lock_outline_white_24dp.xml b/app/src/main/res/drawable-hdpi/ic_lock_outline_white_24dp.xml index 52b307d..4c20c11 100644 --- a/app/src/main/res/drawable-hdpi/ic_lock_outline_white_24dp.xml +++ b/app/src/main/res/drawable-hdpi/ic_lock_outline_white_24dp.xml @@ -1,5 +1,9 @@ - + android:viewportHeight="24.0" + android:viewportWidth="24.0" + android:width="24dp" + xmlns:android="http://schemas.android.com/apk/res/android"> + diff --git a/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.xml b/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.xml index ace746c..7c0394b 100644 --- a/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.xml +++ b/app/src/main/res/drawable-hdpi/ic_settings_black_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" /> diff --git a/app/src/main/res/drawable-hdpi/ic_up_arrow_white_24dp.xml b/app/src/main/res/drawable-hdpi/ic_up_arrow_white_24dp.xml index 14325d8..322bcea 100644 --- a/app/src/main/res/drawable-hdpi/ic_up_arrow_white_24dp.xml +++ b/app/src/main/res/drawable-hdpi/ic_up_arrow_white_24dp.xml @@ -1,4 +1,9 @@ - - + + diff --git a/app/src/main/res/drawable-hdpi/menubackground.xml b/app/src/main/res/drawable-hdpi/menubackground.xml index d8b3c7f..2df60b0 100644 --- a/app/src/main/res/drawable-hdpi/menubackground.xml +++ b/app/src/main/res/drawable-hdpi/menubackground.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable-mdpi/selector_white_gray.xml b/app/src/main/res/drawable-mdpi/selector_white_gray.xml new file mode 100644 index 0000000..8f8c98a --- /dev/null +++ b/app/src/main/res/drawable-mdpi/selector_white_gray.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/round_btn.xml b/app/src/main/res/drawable-xhdpi/round_btn.xml index afce083..b2a0e42 100755 --- a/app/src/main/res/drawable-xhdpi/round_btn.xml +++ b/app/src/main/res/drawable-xhdpi/round_btn.xml @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/round_btn_disable.xml b/app/src/main/res/drawable-xhdpi/round_btn_disable.xml index 0ece78d..13603d8 100755 --- a/app/src/main/res/drawable-xhdpi/round_btn_disable.xml +++ b/app/src/main/res/drawable-xhdpi/round_btn_disable.xml @@ -1,8 +1,9 @@ - + android:bottomLeftRadius="10dp" /> \ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/round_btn_normal.xml b/app/src/main/res/drawable-xhdpi/round_btn_normal.xml index 02b816f..6bfe0d2 100755 --- a/app/src/main/res/drawable-xhdpi/round_btn_normal.xml +++ b/app/src/main/res/drawable-xhdpi/round_btn_normal.xml @@ -1,8 +1,9 @@ - + android:bottomLeftRadius="10dp" /> \ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/round_btn_pressed.xml b/app/src/main/res/drawable-xhdpi/round_btn_pressed.xml index 0b1d3ef..86b12a6 100755 --- a/app/src/main/res/drawable-xhdpi/round_btn_pressed.xml +++ b/app/src/main/res/drawable-xhdpi/round_btn_pressed.xml @@ -1,8 +1,9 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/selector_back_button.xml b/app/src/main/res/drawable-xhdpi/selector_back_button.xml index 6ca1084..da6a569 100755 --- a/app/src/main/res/drawable-xhdpi/selector_back_button.xml +++ b/app/src/main/res/drawable-xhdpi/selector_back_button.xml @@ -1,7 +1,7 @@ - - - - - + - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ai_screen.png b/app/src/main/res/drawable/ai_screen.png deleted file mode 100644 index b9c8da6..0000000 Binary files a/app/src/main/res/drawable/ai_screen.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_file_download_black_24dp.xml b/app/src/main/res/drawable/ic_file_download_black_24dp.xml index c4f4f46..3274b34 100644 --- a/app/src/main/res/drawable/ic_file_download_black_24dp.xml +++ b/app/src/main/res/drawable/ic_file_download_black_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z" /> diff --git a/app/src/main/res/drawable/ic_lock_open_black_24dp.xml b/app/src/main/res/drawable/ic_lock_open_black_24dp.xml index 363e234..ce8f420 100644 --- a/app/src/main/res/drawable/ic_lock_open_black_24dp.xml +++ b/app/src/main/res/drawable/ic_lock_open_black_24dp.xml @@ -1,9 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z" /> diff --git a/app/src/main/res/drawable/ic_outline_settings_24dp.xml b/app/src/main/res/drawable/ic_outline_settings_24dp.xml index b4a866c..62e59ec 100644 --- a/app/src/main/res/drawable/ic_outline_settings_24dp.xml +++ b/app/src/main/res/drawable/ic_outline_settings_24dp.xml @@ -3,10 +3,10 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24"> - - + + diff --git a/app/src/main/res/drawable/round_btn_dark.xml b/app/src/main/res/drawable/round_btn_dark.xml index 0b1d3ef..86b12a6 100755 --- a/app/src/main/res/drawable/round_btn_dark.xml +++ b/app/src/main/res/drawable/round_btn_dark.xml @@ -1,8 +1,9 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/uxsdk_flyzone_legend_drawable.xml b/app/src/main/res/drawable/uxsdk_flyzone_legend_drawable.xml index 977a7a3..cbfd691 100644 --- a/app/src/main/res/drawable/uxsdk_flyzone_legend_drawable.xml +++ b/app/src/main/res/drawable/uxsdk_flyzone_legend_drawable.xml @@ -1,5 +1,4 @@ - - - -