summaryrefslogtreecommitdiff
path: root/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2015-02-22 14:55:40 -0700
committerBdale Garbee <bdale@gag.com>2015-02-22 14:55:40 -0700
commit4af4e36cda96d053458eeb040e35886890917385 (patch)
tree2b1b870b5b15af2fea0297b8cc9a5dff73d265df /altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
parent91b1a80650a7dcd7c5bf819618a8cea0fceb37d9 (diff)
parent106b16b4d5d024543d7ad8c4b4762151e253f3c4 (diff)
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
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;