Switch from GPLv2 to GPLv2+

[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 fb7e18935954a5e6ca4f71803733e516ee06fce1..32ba12546d66c2ae9cbafbb766945f21299053ca 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.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
@@ -17,7 +18,8 @@
 
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_7.*;
+import java.util.*;
+import org.altusmetrum.altoslib_11.*;
 import android.location.Location;
 
 public class TelemetryState {
@@ -29,18 +31,21 @@ public class TelemetryState {
        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;
-               location = null;
+               states = new HashMap<Integer,AltosState>();
                crc_errors = 0;
+               receiver_battery = AltosLib.MISSING;
                frequency = AltosPreferences.frequency(0);
                telemetry_rate = AltosPreferences.telemetry_rate(0);
        }