Skip to content

Configurable temp directory #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JonasVautherin merged 5 commits into from
Jul 15, 2025
Merged

Configurable temp directory #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a999abc
mavsdk_server: add temp directory setter
julianoes Jul 8, 2025
2f2ccf5
Apply suggestion from @JonasVautherin
julianoes Jul 9, 2025
34d6173
Apply suggestion from @julianoes
julianoes Jul 9, 2025
624ca1c
Make setTempDirectory public
julianoes Jul 9, 2025
d62eb57
Bump to 3.7.1
JonasVautherin Jul 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mavsdk_server/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ allprojects {
// version. Say we set this package to be 3.6.0-2-SNAPSHOT, it means that it
// corresponds to mavsdk_server 3.6.0.
val mavsdk_server_release = if (!project.hasProperty("VERSION")) {
"v3.6.0"
"v3.7.1"
} else {
val versionString = project.property("VERSION").toString()
val regex = Regex("v?(\\d+\\.\\d+\\.\\d+)")
Expand Down Expand Up @@ -103,7 +103,7 @@ android {
// MAVSDK-Java package and "SNAPSHOT" optionally sets it as a SNAPSHOT.
version =
if (project.hasProperty("VERSION")) project.property("VERSION").toString()
else "3.6.0-SNAPSHOT"
else "3.7.1-SNAPSHOT"

ndk {
abiFilters += listOf("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
Expand Down
14 changes: 14 additions & 0 deletions mavsdk_server/src/main/cpp/native-lib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,"MAVSDK-Server",__VA_ARGS__)

extern "C" char* mavsdk_temp_path;

extern "C"
{
JNIEXPORT jlong JNICALL
Expand Down Expand Up @@ -77,4 +79,16 @@ extern "C"
auto mavsdk_server = reinterpret_cast<MavsdkServer*>(mavsdkServerHandle);
mavsdk_server_destroy(mavsdk_server);
}

JNIEXPORT void JNICALL
Java_io_mavsdk_mavsdkserver_MavsdkServer_setTempDirectory(JNIEnv *env, jobject thiz, jstring temp_dir)
{
const char* temp_c_str = env->GetStringUTFChars(temp_dir, 0);

static char our_copy[256];
strncpy(our_copy, temp_c_str, sizeof(our_copy));
mavsdk_temp_path = our_copy;

env->ReleaseStringUTFChars(temp_dir, temp_c_str);
}
};
2 changes: 2 additions & 0 deletions mavsdk_server/src/main/java/io/mavsdk/mavsdkserver/MavsdkServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,6 @@ public void destroy() {
}

private native void destroy(long mavsdkServerHandle);

public native void setTempDirectory(String dir);
}
2 changes: 1 addition & 1 deletion sdk/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ group = "io.mavsdk"
// version of the proto files as MAVSDK-C++ v3.6.0.
version =
if (project.hasProperty("VERSION")) project.property("VERSION").toString()
else "3.6.0-SNAPSHOT"
else "3.7.1-SNAPSHOT"

val grpcVersion = "1.61.1"

Expand Down