summaryrefslogtreecommitdiff
path: root/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2015-02-16 20:57:11 -0800
committerKeith Packard <keithp@keithp.com>2015-02-16 20:57:11 -0800
commitc51d39c7ea1153cd2d0dc02c47824a9f35b22fb9 (patch)
treede9f28a3737c3a2dbaa62bb1fd78af47303b67f2 /altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
parentb13a78e4f457f67605fc6dafc7f9733746a4f70c (diff)
altosdroid: Lots of bluetooth connection changes
Appears to more reliably abort in-progress connection attempts so you can switch TBT devices without having the previous device in operation. Shows which device the connection is being attempted for. Eliminate the 10-second timer and just disable the service when the GUI shuts down while no BT connection is running. Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java')
-rw-r--r--altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
index 862847d2..ca066fc2 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
@@ -21,12 +21,13 @@ import org.altusmetrum.altoslib_6.*;
import android.location.Location;
public class TelemetryState {
- public static final int CONNECT_NONE = 0;
- public static final int CONNECT_READY = 1;
- public static final int CONNECT_CONNECTING = 2;
- public static final int CONNECT_CONNECTED = 3;
+ public static final int CONNECT_NONE = 0;
+ public static final int CONNECT_DISCONNECTED = 1;
+ public static final int CONNECT_CONNECTING = 2;
+ public static final int CONNECT_CONNECTED = 3;
int connect;
+ DeviceAddress address;
AltosConfigData config;
AltosState state;
Location location;