Merge branch 'branch-1.6' into debian

Conflicts:
	ChangeLog
	altoslib/AltosTelemetryReader.java
	configure.ac

1 files changed, 55 insertions, 0 deletions

diff --git a/altoslib/AltosSensorTGPS.java b/altoslib/AltosSensorTGPS.java
new file mode 100644
index 00000000..32607fba
--- /dev/null
+++ b/altoslib/AltosSensorTGPS.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2015 Keith Packard <keithp@keithp.com>
+ *
+ * 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.altoslib_6;
+
+import java.util.concurrent.TimeoutException;
+
+public class AltosSensorTGPS {
+	public int	tick;
+	public int	batt;
+
+	static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
+		try {
+			AltosSensorTGPS	sensor_tgps = new AltosSensorTGPS(link);
+
+			if (sensor_tgps == null)
+				return;
+			state.set_battery_voltage(AltosConvert.tele_gps_voltage(sensor_tgps.batt));
+
+		} catch (TimeoutException te) {
+		}
+	}
+
+	public AltosSensorTGPS(AltosLink link) throws InterruptedException, TimeoutException {
+		String[] items = link.adc();
+		for (int i = 0; i < items.length - 1;) {
+			if (items[i].equals("tick:")) {
+				tick = Integer.parseInt(items[i+1]);
+				i += 2;
+				continue;
+			}
+			if (items[i].equals("batt:")) {
+				batt = Integer.parseInt(items[i+1]);
+				i += 2;
+				continue;
+			}
+			i++;
+		}
+	}
+}
+