X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryState.java;h=74d5cd22231aff3f98933aea1bfe11b8a3601c88;hb=4a257455b2dc57069c41e1845daf66239c5cbe1d;hp=c40df64800c2676188fc02c38c63318ba5c9a7d7;hpb=643c2fb03833d658320f476ef731bbb06fe3cc31;p=fw%2Faltos diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java index c40df648..74d5cd22 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_13.*; import android.location.Location; public class TelemetryState { @@ -30,12 +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 states; int latest_serial; @@ -44,7 +46,6 @@ public class TelemetryState { connect = CONNECT_NONE; config = null; states = new HashMap(); - location = null; crc_errors = 0; receiver_battery = AltosLib.MISSING; frequency = AltosPreferences.frequency(0);