Merge branch 'usb_api'

LordBlick · Mar 9, 2013 · cf5a65a · cf5a65a
2 parents f20ee6f + c16ae67
commit cf5a65a
Show file tree

Hide file tree

Showing 11 changed files with 987 additions and 468 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-	Copyright (C) 2010, 2011, 2012 Herbert von Broeuschmeul
-	Copyright (C) 2010, 2011, 2012 BluetoothGPS4Droid Project
-	Copyright (C) 2011, 2012 UsbGPS4Droid Project
+	Copyright (C) 2010, 2011, 2012, 2013 Herbert von Broeuschmeul
+	Copyright (C) 2010, 2011, 2012, 2013 BluetoothGPS4Droid Project
+	Copyright (C) 2011, 2012, 2013 UsbGPS4Droid Project
 	  
 	This file is part of UsbGPS4Droid.
 	
@@ -23,10 +23,11 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.broeuschmeul.android.gps.usb.provider"
-      android:versionCode="126"
+      android:versionCode="127"
       android:versionName="@string/versionName">
 
-	<uses-sdk android:targetSdkVersion="5" android:minSdkVersion="5" />
+    <uses-feature android:name="android.hardware.usb.host" />
+	<uses-sdk android:targetSdkVersion="16" android:minSdkVersion="12" />
 
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -40,6 +41,10 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
+            </intent-filter>
+            <meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" android:resource="@xml/device_filter" />
         </activity>
 
 <!--  

diff --git a/project.properties b/project.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-5
+target=android-16
diff --git a/readme.textile b/readme.textile
@@ -1,3 +1,12 @@
+*UsbGPS4DHoneycomb_MR1 beta1* (2013-03-09): recommended for Android version greater or equal than Honeycomb MR1 (Android SDK version 12)
+* New version which uses Android SDK USB Host API
+* Add auto-conf option for gps baud rate
+* Re-enable SiRF options
+* Bug fix : correction in SiRF options summary description
+* Bug fix : correction in NMEA checksum calcul
+* Bug fix : NMEA sentences without checksum weren't correctly parsed
+* Update copyright info in source and about app message
+
 *UsbGPS4Droid alpha5* (2012-08-26)
 * Change command used to define connection speed ("see gitub issue #1 comment #2":https://github.com/HvB/UsbGps4Droid/issues/1#issuecomment-5768439 )
 * Bug fix (see gitub issue #2: "Bluetooth error messages":https://github.com/HvB/UsbGps4Droid/issues/2 )

diff --git a/res/values/constants.xml b/res/values/constants.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-	Copyright (C) 2010, 2011, 2012 Herbert von Broeuschmeul
-	Copyright (C) 2010, 2011, 2012 BluetoothGPS4Droid Project
-	Copyright (C) 2011, 2012 UsbGPS4Droid Project
+	Copyright (C) 2010, 2011, 2012, 2013 Herbert von Broeuschmeul
+	Copyright (C) 2010, 2011, 2012, 2013 BluetoothGPS4Droid Project
+	Copyright (C) 2011, 2012, 2013 UsbGPS4Droid Project
 	  
 	This file is part of UsbGPS4Droid.
 	
@@ -22,7 +22,7 @@
 -->
 
 <resources>
-	<string name="versionName">alpha 5</string>
+	<string name="versionName">beta 1</string>
 
     <string name="pref_start_gps_key">startGps</string>
     <string name="pref_gps_location_provider_key">gpsLocationProviderKey</string>
@@ -54,7 +54,8 @@
     <string name="defaultTrackFilePrefix">usbnmeatrack</string>
     <string name="defaultMockGpsName">usb_gps</string>
     <string name="defaultGpsDevice">/dev/ttyUSB0</string>
-    <string name="defaultGpsDeviceSpeed">auto</string>
+    <string name="defaultGpsDeviceSpeed">4800</string>
+    <string name="autoGpsDeviceSpeed">auto</string>
 
 
     <string name="sirf_nmea_gga_on">PSRF103,00,00,01,01</string>
@@ -73,6 +74,7 @@
     <string name="sirf_nmea_zda_off">PSRF103,08,00,00,01</string>
 
     <string name="sirf_nmea_to_binary">PSRF100,0,38400,8,1,0</string>
+    <string name="sirf_nmea_to_binary_alt" formatted="false">PSRF100,0,%d,8,1,0</string>
 
     <string name="sirf_nmea_sbas_on">PSRF151,01</string>
     <string name="sirf_nmea_sbas_off">PSRF151,00</string>
@@ -82,6 +84,7 @@
     <string name="sirf_bin_to_nmea">8702</string>
     <string name="sirf_bin_to_nmea_38400">810201010001050105010001000100010001000100019600</string>
     <string name="sirf_bin_to_nmea_38400_alt" formatted="false">8102%02X01%02X01%02X01%02X01%02X01%02X01%02X01%02X01%02X0100019600</string>
+    <string name="sirf_bin_to_nmea_alt" formatted="false">8102%02X01%02X01%02X01%02X01%02X01%02X01%02X01%02X01%02X010001%04X</string>
     <string name="sirf_bin_dgps_ext_on">85020000000000</string>
     <string name="sirf_bin_dgps_sbas_on">85010000000000</string>
     <string name="sirf_software_version">8400</string>   

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-	Copyright (C) 2010, 2011, 2012 Herbert von Broeuschmeul
-	Copyright (C) 2010, 2011, 2012 BluetoothGPS4Droid Project
-	Copyright (C) 2011, 2012 UsbGPS4Droid Project
+	Copyright (C) 2010, 2011, 2012, 2013 Herbert von Broeuschmeul
+	Copyright (C) 2010, 2011, 2012, 2013 BluetoothGPS4Droid Project
+	Copyright (C) 2011, 2012, 2013 UsbGPS4Droid Project
 	  
 	This file is part of UsbGPS4Droid.
 	
@@ -117,9 +117,9 @@
 
     <string name="about_title">About</string>
     <string name="about_version">UsbGPS4Droid version</string>
-    <string name="about_copyright_1">Copyright (C) 2010, 2011, 2012 Herbert von Broeuschmeul</string>
-    <string name="about_copyright_2">Copyright (C) 2010, 2011, 2012 BluetoothGPS4Droid Project</string>
-    <string name="about_copyright_3">Copyright (C) 2011, 2012 UsbGPS4Droid Project</string>
+    <string name="about_copyright_1">Copyright (C) 2010-2013 Herbert von Broeuschmeul</string>
+    <string name="about_copyright_2">Copyright (C) 2010-2013 BluetoothGPS4Droid Project</string>
+    <string name="about_copyright_3">Copyright (C) 2011-2013 UsbGPS4Droid Project</string>
     <string name="about_app_desc">Usb GPS for Android is an application 
     	for using an external usb GPS on Android devices.
     </string>
@@ -137,5 +137,7 @@
         <item >9600</item>
         <item >19200</item>
         <item >38400</item>
+        <item >57600</item>
+        <item >115200</item>
     </string-array>
 </resources>
diff --git a/res/xml/device_filter.xml b/res/xml/device_filter.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <usb-device vendor-id="1659" product-id="8963" />
+</resources>
diff --git a/res/xml/pref.xml b/res/xml/pref.xml
@@ -24,13 +24,13 @@
 <PreferenceScreen
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:title="@string/app_name" >
-	<EditTextPreference
+	<ListPreference 
 		android:dialogTitle="@string/pref_gps_device_title"
 		android:title="@string/pref_gps_device_title" 
 		android:key="@string/pref_gps_device_key" 	
-		android:defaultValue="@string/defaultGpsDevice"
 		android:summary="@string/pref_gps_device_summary" />
 	<ListPreference 
+		android:enabled="true"
 		android:dialogTitle="@string/pref_gps_device_speed_title"
 		android:title="@string/pref_gps_device_speed_title" 
 		android:dependency="@string/pref_start_gps_key"
@@ -83,7 +83,7 @@
 			android:summary="@string/pref_connection_retries_summary" />
 	</PreferenceScreen>
 	<CheckBoxPreference 
-		android:enabled="false"
+		android:enabled="true"
 		android:key="@string/pref_sirf_gps_key"
 		android:persistent="true"
 		android:defaultValue="false"