Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / TelemetryState.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
index d3341739afb28bf53c75f0cc65afb3a589c5b2ff..ca066fc27cfa461efe64cbb711bc91d44ee1dff2 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
@@ -17,16 +17,17 @@
 
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_5.*;
+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;