X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryState.java;h=c40df64800c2676188fc02c38c63318ba5c9a7d7;hp=d3341739afb28bf53c75f0cc65afb3a589c5b2ff;hb=9af72a2e629779833ff1787bbfc2ddc8b9d88bba;hpb=101ac21f05a69bdeb07d423aa18017eca04fc47f

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
index d3341739..c40df648 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
@@ -17,29 +17,36 @@
 
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_5.*;
+import java.util.*;
+import org.altusmetrum.altoslib_7.*;
 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;
 	int		crc_errors;
+	double		receiver_battery;
 	double		frequency;
 	int		telemetry_rate;
 
+	HashMap<Integer,AltosState>	states;
+
+	int		latest_serial;
+
 	public TelemetryState() {
 		connect = CONNECT_NONE;
 		config = null;
-		state = null;
+		states = new HashMap<Integer,AltosState>();
 		location = null;
 		crc_errors = 0;
+		receiver_battery = AltosLib.MISSING;
 		frequency = AltosPreferences.frequency(0);
 		telemetry_rate = AltosPreferences.telemetry_rate(0);
 	}