X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosDroid.java;h=30a949d57378cf8607c7a7a2e5a230e9c2dfb7c3;hp=e5f56a5a9688893c36688b51c854148da1704995;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hpb=204ae5142702044eb8ad2697a55028e904067958 diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index e5f56a5a..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 { @@ -71,15 +72,19 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener, public static final int REQUEST_CONNECT_DEVICE = 1; public static final int REQUEST_ENABLE_BT = 2; public static final int REQUEST_PRELOAD_MAPS = 3; - public static final int REQUEST_MAP_TYPE = 4; public static final int REQUEST_IDLE_MODE = 5; public static final int REQUEST_IGNITERS = 6; + public static final int REQUEST_SETUP = 7; public static final String EXTRA_IDLE_MODE = "idle_mode"; public static final String EXTRA_IDLE_RESULT = "idle_result"; public static final String EXTRA_TELEMETRY_SERVICE = "telemetry_service"; - public int map_type = AltosMap.maptype_hybrid; + // Setup result bits + public static final int SETUP_BAUD = 1; + public static final int SETUP_UNITS = 2; + public static final int SETUP_MAP_SOURCE = 4; + public static final int SETUP_MAP_TYPE = 8; public static FragmentManager fm; @@ -105,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; @@ -534,11 +536,6 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener, return tab_view; } - public void set_map_source(int source) { - for (AltosDroidTab mTab : mTabs) - mTab.set_map_source(source); - } - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -757,19 +754,41 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener, AltosDebug.debug("BT not enabled"); } break; - case REQUEST_MAP_TYPE: - if (resultCode == Activity.RESULT_OK) - set_map_type(data); - break; case REQUEST_IDLE_MODE: if (resultCode == Activity.RESULT_OK) idle_mode(data); break; case REQUEST_IGNITERS: break; + case REQUEST_SETUP: + if (resultCode == Activity.RESULT_OK) + note_setup_changes(data); + break; } } + private void note_setup_changes(Intent data) { + int changes = data.getIntExtra(SetupActivity.EXTRA_SETUP_CHANGES, 0); + + if ((changes & SETUP_BAUD) != 0) { + try { + mService.send(Message.obtain(null, TelemetryService.MSG_SETBAUD, + AltosPreferences.telemetry_rate(1))); + } catch (RemoteException re) { + } + } + if ((changes & SETUP_UNITS) != 0) { + /* nothing to do here */ + } + if ((changes & SETUP_MAP_SOURCE) != 0) { + /* nothing to do here */ + } + if ((changes & SETUP_MAP_TYPE) != 0) { + /* nothing to do here */ + } + set_switch_time(); + } + private void connectUsb(UsbDevice device) { if (mService == null) pending_usb_device = device; @@ -807,24 +826,13 @@ 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) { } } - private void set_map_type(Intent data) { - int type = data.getIntExtra(MapTypeActivity.EXTRA_MAP_TYPE, -1); - - AltosDebug.debug("intent set_map_type %d\n", type); - if (type != -1) { - map_type = type; - for (AltosDroidTab mTab : mTabs) - mTab.set_map_type(map_type); - } - } - private void idle_mode(Intent data) { int type = data.getIntExtra(IdleModeActivity.EXTRA_IDLE_RESULT, -1); Message msg; @@ -874,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) { @@ -974,32 +979,28 @@ 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: + serverIntent = new Intent(this, SetupActivity.class); + startActivityForResult(serverIntent, REQUEST_SETUP); + return true; 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]); @@ -1008,44 +1009,6 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener, AlertDialog alert_freq = builder_freq.create(); alert_freq.show(); return true; - case R.id.select_rate: - // Set the TBT baud rate - - final String[] rates = { - "38400", - "9600", - "2400", - }; - - AlertDialog.Builder builder_rate = new AlertDialog.Builder(this); - builder_rate.setTitle("Pick a baud rate"); - builder_rate.setItems(rates, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int item) { - setBaud(rates[item]); - } - }); - AlertDialog alert_rate = builder_rate.create(); - alert_rate.show(); - return true; - case R.id.change_units: - boolean imperial = AltosPreferences.imperial_units(); - AltosPreferences.set_imperial_units(!imperial); - return true; - case R.id.preload_maps: - serverIntent = new Intent(this, PreloadMapActivity.class); - startActivityForResult(serverIntent, REQUEST_PRELOAD_MAPS); - return true; - case R.id.map_type: - serverIntent = new Intent(this, MapTypeActivity.class); - startActivityForResult(serverIntent, REQUEST_MAP_TYPE); - return true; - case R.id.map_source: - int source = AltosDroidPreferences.map_source(); - int new_source = source == AltosDroidPreferences.MAP_SOURCE_ONLINE ? AltosDroidPreferences.MAP_SOURCE_OFFLINE : AltosDroidPreferences.MAP_SOURCE_ONLINE; - AltosDroidPreferences.set_map_source(new_source); - set_map_source(new_source); - return true; case R.id.select_tracker: if (serials != null) { String[] trackers = new String[serials.length+1];