X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryState.java;h=77cee787b56219fc27b4fab518c057389fa411d6;hb=a61217f0a6d0ef48b6471f632c4600255867e831;hp=d023128f30bed382373bb85128a8a4c07984bea5;hpb=c813c2c8f71017a686128e06b5178fc99ece251c;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
index d023128f..77cee787 100644
--- 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
@@ -18,7 +19,7 @@
 package org.altusmetrum.AltosDroid;
 
 import java.util.*;
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_12.*;
 import android.location.Location;
 
 public class TelemetryState {
@@ -30,11 +31,13 @@ public class TelemetryState {
 	int		connect;
 	DeviceAddress	address;
 	AltosConfigData	config;
-	Location	location;
 	int		crc_errors;
+	double		receiver_battery;
 	double		frequency;
 	int		telemetry_rate;
 
+	boolean		quiet;
+
 	HashMap<Integer,AltosState>	states;
 
 	int		latest_serial;
@@ -43,8 +46,8 @@ public class TelemetryState {
 		connect = CONNECT_NONE;
 		config = 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);
 	}