X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosGPSQuery.java;h=deb9d201052a6bdc780dd47b2280c16c4b537909;hb=f6661cc015e1a92450dc3eede97d66005f69cc72;hp=ca04795d5ac4650180671304c5fa554d7ef2918c;hpb=82f798e7b1343a56203af2e89790f6de9ab9f98d;p=fw%2Faltos

diff --git a/altoslib/AltosGPSQuery.java b/altoslib/AltosGPSQuery.java
index ca04795d..deb9d201 100644
--- a/altoslib/AltosGPSQuery.java
+++ b/altoslib/AltosGPSQuery.java
@@ -15,72 +15,10 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_1;
 
 import java.util.concurrent.*;
 
-class AltosADCTM {
-	int	tick;
-	int	accel;
-	int	pres;
-	int	temp;
-	int	batt;
-	int	drogue;
-	int	main;
-
-	public AltosADCTM(AltosLink link) throws InterruptedException, TimeoutException {
-		link.printf("a\n");
-		for (;;) {
-			String line = link.get_reply_no_dialog(5000);
-			if (line == null) {
-				throw new TimeoutException();
-			}
-			if (!line.startsWith("tick:"))
-				continue;
-			String[] items = line.split("\\s+");
-			for (int i = 0; i < items.length;) {
-				if (items[i].equals("tick:")) {
-					tick = Integer.parseInt(items[i+1]);
-					i += 2;
-					continue;
-				}
-				if (items[i].equals("accel:")) {
-					accel = Integer.parseInt(items[i+1]);
-					i += 2;
-					continue;
-				}
-				if (items[i].equals("pres:")) {
-					pres = Integer.parseInt(items[i+1]);
-					i += 2;
-					continue;
-				}
-				if (items[i].equals("temp:")) {
-					temp = Integer.parseInt(items[i+1]);
-					i += 2;
-					continue;
-				}
-				if (items[i].equals("batt:")) {
-					batt = Integer.parseInt(items[i+1]);
-					i += 2;
-					continue;
-				}
-				if (items[i].equals("drogue:")) {
-					drogue = Integer.parseInt(items[i+1]);
-					i += 2;
-					continue;
-				}
-				if (items[i].equals("main:")) {
-					main = Integer.parseInt(items[i+1]);
-					i += 2;
-					continue;
-				}
-				i++;
-			}
-			break;
-		}
-	}
-}
-
 class AltosGPSQuery extends AltosGPS {
 	public AltosGPSQuery (AltosLink link, AltosConfigData config_data)
 		throws TimeoutException, InterruptedException {