From 0f01f7c90a7e81d14444de6232a89c06d0721ad6 Mon Sep 17 00:00:00 2001 From: Alex Robin Date: Tue, 15 Jan 2019 20:07:02 +0100 Subject: [PATCH] Default to quaternion orientation --- sensorhub-android-app/res/xml/pref_sensors.xml | 4 ++-- .../src/org/sensorhub/android/MainActivity.java | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/sensorhub-android-app/res/xml/pref_sensors.xml b/sensorhub-android-app/res/xml/pref_sensors.xml index af85dd9b..6eb6b549 100644 --- a/sensorhub-android-app/res/xml/pref_sensors.xml +++ b/sensorhub-android-app/res/xml/pref_sensors.xml @@ -19,13 +19,13 @@ android:title="Magnetometer Data" /> diff --git a/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java b/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java index 28689156..cdbce2e1 100644 --- a/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java +++ b/sensorhub-android-app/src/org/sensorhub/android/MainActivity.java @@ -41,6 +41,7 @@ import org.sensorhub.impl.client.sost.SOSTClient; import org.sensorhub.impl.client.sost.SOSTClient.StreamInfo; import org.sensorhub.impl.client.sost.SOSTClientConfig; +//import org.sensorhub.impl.driver.dji.DjiConfig; import org.sensorhub.impl.driver.flir.FlirOneCameraConfig; import org.sensorhub.impl.module.InMemoryConfigDb; import org.sensorhub.impl.sensor.android.AndroidSensorsConfig; @@ -200,6 +201,21 @@ protected void updateConfig(SharedPreferences prefs, String runName) sensorhubConfig.add(flironeConfig); addSosTConfig(flironeConfig, sosUser, sosPwd); } + + // DJI Drone + /*enabled = prefs.getBoolean("dji_enabled", false); + if (enabled) + { + DjiConfig djiConfig = new DjiConfig(); + djiConfig.id = "DJI_DRONE"; + djiConfig.name = "DJI Aircraft [" + deviceName + "]"; + djiConfig.autoStart = true; + djiConfig.androidContext = this.getApplicationContext(); + djiConfig.camPreviewTexture = boundService.getVideoTexture(); + showVideo = true; + sensorhubConfig.add(djiConfig); + addSosTConfig(djiConfig, sosUser, sosPwd); + }*/ }