Merge branch 'master' into release

arthurbenemann · arthurbenemann · commit 14b790150860 · 2014-06-27T09:55:49.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,20 @@
+language: android
+android:
+  components:
+    - build-tools-19.1.0
+  licenses:
+    - 'android-sdk-license-.+'
+
+script:
+    - ./gradlew build
+
+deploy:
+  provider: releases
+  api_key:
+    secure: N1sRQjwlExc51dA10dOvzdnkYMh9/X9WZmKwYqnWOguV+0dg3Jw2xXyBRxZLO1olIlIV0XGaI1HLAAO0OaFEYyWMO9BkZ60aJC8gePGnnwk1LSYR2moGAtlF6Y+aumfMZzXG4gU4QlVKbMd0uLvUWKu6eTqoMtVe+/C8GeJn6pk=
+  file:
+    - "./Android/build/outputs/apk/Android-release-unsigned.apk"
+  skip_cleanup: true
+  on:
+    tags: true
+    branch: feature_travis_ci
diff --git a/Android/assets/Parameters/ParameterMetaData.xml b/Android/assets/Parameters/ParameterMetaData.xml
diff --git a/Android/build.gradle b/Android/build.gradle
@@ -7,8 +7,8 @@ repositories {
 dependencies {
     compile 'com.android.support:support-v4:19.+'
     compile files('libs/droneapi-java.jar')
-    compile 'com.google.android.gms:play-services:4.0.30'
-    compile 'com.google.guava:guava:16.0.1'
+    compile 'com.google.android.gms:play-services:4.+'
+    compile 'com.google.guava:guava:17.0'
     compile 'org.slf4j:slf4j-api:1.7.7'
     compile 'org.slf4j:slf4j-nop:1.7.7'
     compile 'org.osmdroid:osmdroid-android:4.1'
@@ -58,6 +58,11 @@ android {
         release.setRoot('build-types/release')
     }
 
+    //FIXME: remove this after lint errors have been taken care of
+    lintOptions {
+        abortOnError false
+    }
+
 }
 
 def getGitVersion(){
diff --git a/Android/libs/android-support-v4.jar b/Android/libs/android-support-v4.jar
diff --git a/Android/libs/guava-17.0.jar b/Android/libs/guava-17.0.jar
diff --git a/Android/res/values-de/strings.xml b/Android/res/values-de/strings.xml
@@ -23,8 +23,6 @@
     <string name="pref_connection_type">Telemetrie-Verbindungstyp</string>
     <string name="pref_connection_type_summary">Verbindung zur Drohne wählen</string>
     <string name="pref_mavlink">MAVLink</string>
-    <string name="pref_mavlink_log">Protokollierung aktivieren</string>
-    <string name="pref_mavlink_log_summary">Protokolliert die MAVLink Verbindung in eine *.tlog Datei; kann die Performance beeinträchtigen</string>
     <string name="pref_mavlink_rates">Datenraten</string>
     <string name="pref_mavlink_rates_summary">Rate (in Hz), mit welcher die Flugdaten von der Drohne empfangen werden</string>
     <string name="pref_mavlink_stream_rate_ext_stat">Wegpunkte, GPS Rohdaten, Zaundaten, aktueller Wegpunkt, etc</string>
diff --git a/Android/res/values-zh-rCN/strings.xml b/Android/res/values-zh-rCN/strings.xml
@@ -23,10 +23,7 @@
 
     <!-- App Settings/Preferences -->
     <string name="pref_connection_type">遥测连接方式</string>
-    <string name="pref_connection_type_summary">选择用来连接无人机分链接</string>
-    <string name="pref_mavlink">MAVLink</string>
-    <string name="pref_mavlink_log">启用日志</string>
-    <string name="pref_mavlink_log_summary">记录MAVLink通信至*.tlog文件，可能会降低性能</string>
+    <string name="pref_connection_type_summary">选择用来连接无人机分链接</string>    
     <string name="pref_mavlink_rates">流速</string>
     <string name="pref_mavlink_rates_summary">从无人机接受飞行数据的速度（以Hz为单位）</string>
     <string name="pref_mavlink_stream_rate_ext_stat">航点、GPS原始数据、围栏数据、当前航点等</string>
@@ -128,7 +125,6 @@
     <!-- Survey/Mapping related strings -->
     <string name="distance_between_lines">横向的</string>
     <string name="footprint">足迹</string>
-    <string name="ground_resolution">GSD</string>
     <string name="distance_between_pictures">纵向的</string>
     <string name="area">区域</string>
     <string name="camera_">相机：</string>
diff --git a/Android/res/values/strings.xml b/Android/res/values/strings.xml
@@ -28,8 +28,6 @@
     <string name="pref_maps_providers_summary">Which map provider to use.</string>
     <string name="pref_maps_providers_title">Maps providers</string>
     <string name="pref_mavlink">MAVLink</string>
-    <string name="pref_mavlink_log">Enable Logging</string>
-    <string name="pref_mavlink_log_summary">Logs the MAVLink communication to a *.tlog file, may degrade performance</string>
     <string name="pref_mavlink_rates">Stream Rates</string>
     <string name="pref_mavlink_rates_summary">Rate in which flight data should be received from the drone (in Hz)</string>
     <string name="pref_mavlink_stream_rate_ext_stat">Waypoints, GPS raw, fence data, current waypoint, etc</string>
diff --git a/Android/res/xml/device_filter.xml b/Android/res/xml/device_filter.xml
@@ -10,6 +10,7 @@
 	<usb-device vendor-id="1412" product-id="45088" /> <!-- REX-USB60F -->
     <usb-device vendor-id="9025" product-id="16" /><!-- APM 2.5 device -->    
     <usb-device vendor-id="9900" product-id="16" /><!-- APM 2.5 device -->
+    <usb-device vendor-id="9900" product-id="17" /><!-- Pixhawk device -->
     <usb-device vendor-id="5824" product-id="1155" /><!--  Teensyduino  -->
     <usb-device vendor-id="4292" product-id="60000" /><!-- CP210x UART Bridge -->
     <usb-device vendor-id="1118" product-id="688"/>
diff --git a/Android/res/xml/preferences.xml b/Android/res/xml/preferences.xml
diff --git a/Android/src/org/droidplanner/android/communication/connection/MAVLinkConnection.java b/Android/src/org/droidplanner/android/communication/connection/MAVLinkConnection.java
@@ -75,13 +75,12 @@ public void run() {
 		try {
 			parser.stats.mavlinkResetStats();
 			openConnection();
-			if (prefs.getLogEnabled()) {
-				logFile = FileStream.getTLogFile();
-				logWriter = FileStream.openOutputStream(logFile);
-				logBuffer = ByteBuffer.allocate(Long.SIZE / Byte.SIZE);
-				logBuffer.order(ByteOrder.BIG_ENDIAN);
-			}
-
+			
+			logFile = FileStream.getTLogFile();
+			logWriter = FileStream.openOutputStream(logFile);
+			logBuffer = ByteBuffer.allocate(Long.SIZE / Byte.SIZE);
+			logBuffer.order(ByteOrder.BIG_ENDIAN);
+			
 			String login = prefs.getDroneshareLogin();
 			String password = prefs.getDronesharePassword();
 			if (prefs.getLiveUploadEnabled() && !login.isEmpty()
diff --git a/Android/src/org/droidplanner/android/utils/DroidplannerPrefs.java b/Android/src/org/droidplanner/android/utils/DroidplannerPrefs.java
@@ -38,10 +38,6 @@ public DroidplannerPrefs(Context context) {
 		prefs = PreferenceManager.getDefaultSharedPreferences(context);
 	}
 
-	public boolean getLogEnabled() {
-		return prefs.getBoolean("pref_mavlink_log_enabled", false);
-	}
-
 	public boolean getLiveUploadEnabled() {
 		return prefs.getBoolean("pref_live_upload_enabled", false);
 	}
diff --git a/Core/build.gradle b/Core/build.gradle
@@ -5,9 +5,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.google.android.gms:play-services:4.0.30'
     compile 'de.greenrobot:eventbus:2.2.1'
-
     compile project(':Mavlink')
 }
 
diff --git a/HorizontalVariableListView/HorizontalVariableListView/build.gradle b/HorizontalVariableListView/HorizontalVariableListView/build.gradle
@@ -3,13 +3,13 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.7.+'
+        classpath 'com.android.tools.build:gradle:0.+'
     }
 }
 apply plugin: 'android-library'
 
 dependencies {
-    compile 'com.android.support:support-v4:18.0.0'
+    compile 'com.android.support:support-v4:19.+'
 }
 
 android {
@@ -33,4 +33,9 @@ android {
 
         instrumentTest.setRoot('tests')
     }
+
+    //FIXME: remove this after lint errors have been taken care of
+    lintOptions {
+        abortOnError false
+    }
 }
diff --git a/HorizontalVariableListView/HorizontalVariableListView/libs/android-support-v4.jar b/HorizontalVariableListView/HorizontalVariableListView/libs/android-support-v4.jar
diff --git a/Mavlink/build.gradle b/Mavlink/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'android-library'
 
 dependencies {
-    compile 'com.android.support:support-v4:18.0.0'
+    compile 'com.android.support:support-v4:19.+'
 }
 
 android {
diff --git a/Mavlink/libs/android-support-v4.jar b/Mavlink/libs/android-support-v4.jar
diff --git a/README.md b/README.md
@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/DroidPlanner/droidplanner.svg?branch=master)](https://travis-ci.org/DroidPlanner/droidplanner)
+
 # DroidPlanner
 
 Droidplanner is a Ground Control Station (GCS) Android app for UAVs running Ardupilot software.
diff --git a/google-play-services_lib/build.gradle b/google-play-services_lib/build.gradle
diff --git a/usb-serial-for-android/UsbSerialLibrary/src/com/hoho/android/usbserial/driver/CdcAcmSerialDriver.java b/usb-serial-for-android/UsbSerialLibrary/src/com/hoho/android/usbserial/driver/CdcAcmSerialDriver.java
@@ -245,6 +245,7 @@ public static Map<Integer, int[]> getSupportedDevices() {
         supportedDevices.put(Integer.valueOf(UsbId.VENDOR_ARDUINO2),
                 new int[] {
                         UsbId.VAN_OOIJEN_TECH_TEENSYDUINO_SERIAL,
+                        UsbId.PIXHAWK,
                 });
         return supportedDevices;
     }
diff --git a/usb-serial-for-android/UsbSerialLibrary/src/com/hoho/android/usbserial/driver/UsbId.java b/usb-serial-for-android/UsbSerialLibrary/src/com/hoho/android/usbserial/driver/UsbId.java
@@ -47,6 +47,7 @@ public final class UsbId {
     public static final int ARDUINO_MEGA_ADK_R3 = 0x0044;
     public static final int ARDUINO_SERIAL_ADAPTER_R3 = 0x0044;
     public static final int ARDUINO_LEONARDO = 0x8036;
+    public static final int PIXHAWK = 0x0011;
 
     public static final int VENDOR_VAN_OOIJEN_TECH = 0x16c0;
     public static final int VAN_OOIJEN_TECH_TEENSYDUINO_SERIAL = 0x0483;
