From: Keith Packard <keithp@keithp.com>
Date: Sat, 7 Feb 2015 04:45:28 +0000 (-0800)
Subject: altoslib: Support TeleGPS for Monitor Idle
X-Git-Tag: 1.6~20
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=449c6731b1977c7623dd006ec2db56f383f8d85a;hp=58f06706383418ebfa56d88ba51411e6185e09df

altoslib: Support TeleGPS for Monitor Idle

TeleGPS has ADC and GPS values, so build the necessary ADC parser and
then hook up GPS parsing.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altoslib/AltosIdleFetch.java b/altoslib/AltosIdleFetch.java
index 981035d4..8958d80c 100644
--- a/altoslib/AltosIdleFetch.java
+++ b/altoslib/AltosIdleFetch.java
@@ -38,6 +38,7 @@ class AltosIdler {
 	static final int	idle_sensor_mega = 12;
 	static final int	idle_sensor_emini = 13;
 	static final int	idle_sensor_tmini = 14;
+	static final int	idle_sensor_tgps = 15;
 
 	public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException, TimeoutException {
 		for (int idler : idlers) {
@@ -72,6 +73,10 @@ class AltosIdler {
 				break;
 			case idle_sensor_tmini:
 				AltosSensorTMini.update_state(state, link, config_data);
+				break;
+			case idle_sensor_tgps:
+				AltosSensorTGPS.update_state(state, link, config_data);
+				break;
 			}
 			if (idle != null)
 				idle.update_state(state);
@@ -122,6 +127,9 @@ public class AltosIdleFetch implements AltosStateUpdate {
 			       AltosIdler.idle_ms5607, AltosIdler.idle_mma655x,
 			       AltosIdler.idle_imu, AltosIdler.idle_mag,
 			       AltosIdler.idle_sensor_mega),
+		new AltosIdler("TeleGPS",
+			       AltosIdler.idle_gps,
+			       AltosIdler.idle_sensor_tgps),
 	};
 
 	AltosLink		link;
diff --git a/altoslib/AltosSensorTGPS.java b/altoslib/AltosSensorTGPS.java
new file mode 100644
index 00000000..91a85fe8
--- /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_5;
+
+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++;
+		}
+	}
+}
+
diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am
index 8aff2767..c640c69c 100644
--- a/altoslib/Makefile.am
+++ b/altoslib/Makefile.am
@@ -90,6 +90,7 @@ altoslib_JAVA = \
 	AltosSensorTMini.java \
 	AltosSensorMega.java \
 	AltosSensorMetrum.java \
+	AltosSensorTGPS.java \
 	AltosState.java \
 	AltosStateIterable.java \
 	AltosStateUpdate.java \