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

Conflicts:
	ao-bringup/turnon_telemega

1 files changed, 46 insertions, 0 deletions

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
new file mode 100644
index 00000000..d3341739
--- /dev/null
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryState.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2012 Mike Beattie <mike@ethernal.org>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.AltosDroid;
+
+import org.altusmetrum.altoslib_5.*;
+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;
+
+	int		connect;
+	AltosConfigData	config;
+	AltosState	state;
+	Location	location;
+	int		crc_errors;
+	double		frequency;
+	int		telemetry_rate;
+
+	public TelemetryState() {
+		connect = CONNECT_NONE;
+		config = null;
+		state = null;
+		location = null;
+		crc_errors = 0;
+		frequency = AltosPreferences.frequency(0);
+		telemetry_rate = AltosPreferences.telemetry_rate(0);
+	}
+}