Skip to content

Commit

Permalink
Default to quaternion orientation
Browse files Browse the repository at this point in the history
  • Loading branch information
alexrobin committed Jan 15, 2019
1 parent 33817f6 commit 0f01f7c
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sensorhub-android-app/res/xml/pref_sensors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
android:title="Magnetometer Data" />

<CheckBoxPreference
android:defaultValue="false"
android:defaultValue="true"
android:key="orient_quat_enabled"
android:summary="Enable streaming of orientation data"
android:title="Orientation Data (Quaternions)" />

<CheckBoxPreference
android:defaultValue="true"
android:defaultValue="false"
android:key="orient_euler_enabled"
android:summary="Enable streaming of orientation data"
android:title="Orientation Data (Euler Angles)" />
Expand Down
16 changes: 16 additions & 0 deletions sensorhub-android-app/src/org/sensorhub/android/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}*/
}


Expand Down

0 comments on commit 0f01f7c

Please sign in to comment.