X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=30a949d57378cf8607c7a7a2e5a230e9c2dfb7c3;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hp=ea3bbae65d69d4a678432bcb4e72e7447a1c825d;hpb=d81f94fd5339d513de9bde5a2e19f8eca526344f;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index ea3bbae6..30a949d5 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -51,7 +52,7 @@ import android.hardware.usb.*;
 import android.graphics.*;
 import android.graphics.drawable.*;
 
-import org.altusmetrum.altoslib_10.*;
+import org.altusmetrum.altoslib_11.*;
 
 public class AltosDroid extends FragmentActivity implements AltosUnitsListener, LocationListener {
 
@@ -109,9 +110,6 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
 	// field to display the version at the bottom of the screen
 	private TextView mVersion;
 
-	private double frequency;
-	private int telemetry_rate;
-
 	private boolean idle_mode = false;
 
 	public Location location = null;
@@ -828,9 +826,9 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
 		}
 	}
 
-	private void disconnectDevice() {
+	private void disconnectDevice(boolean remember) {
 		try {
-			mService.send(Message.obtain(null, TelemetryService.MSG_DISCONNECT, null));
+			mService.send(Message.obtain(null, TelemetryService.MSG_DISCONNECT, (Boolean) remember));
 		} catch (RemoteException e) {
 		}
 	}
@@ -884,11 +882,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
 		}
 	}
 
-	void setFrequency(String freq) {
-		try {
-			setFrequency (AltosParse.parse_double_net(freq.substring(11, 17)));
-		} catch (ParseException e) {
-		}
+	void setFrequency(AltosFrequency frequency) {
+		setFrequency (frequency.frequency);
 	}
 
 	void setBaud(int baud) {
@@ -984,11 +979,11 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
 		case R.id.disconnect:
 			/* Disconnect the device
 			 */
-			disconnectDevice();
+			disconnectDevice(false);
 			return true;
 		case R.id.quit:
 			AltosDebug.debug("R.id.quit");
-			disconnectDevice();
+			disconnectDevice(true);
 			finish();
 			return true;
 		case R.id.setup:
@@ -998,22 +993,14 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener,
 		case R.id.select_freq:
 			// Set the TBT radio frequency
 
-			final String[] frequencies = {
-				"Channel 0 (434.550MHz)",
-				"Channel 1 (434.650MHz)",
-				"Channel 2 (434.750MHz)",
-				"Channel 3 (434.850MHz)",
-				"Channel 4 (434.950MHz)",
-				"Channel 5 (435.050MHz)",
-				"Channel 6 (435.150MHz)",
-				"Channel 7 (435.250MHz)",
-				"Channel 8 (435.350MHz)",
-				"Channel 9 (435.450MHz)"
-			};
+			final AltosFrequency[] frequencies = AltosPreferences.common_frequencies();
+			String[] frequency_strings = new String[frequencies.length];
+			for (int i = 0; i < frequencies.length; i++)
+				frequency_strings[i] = frequencies[i].toString();
 
 			AlertDialog.Builder builder_freq = new AlertDialog.Builder(this);
 			builder_freq.setTitle("Pick a frequency");
-			builder_freq.setItems(frequencies,
+			builder_freq.setItems(frequency_strings,
 					 new DialogInterface.OnClickListener() {
 						 public void onClick(DialogInterface dialog, int item) {
 							 setFrequency(frequencies[item]);