Merge branch 'branch-1.7' into debian

1 files changed, 0 insertions, 70 deletions

diff --git a/altoslib/AltosSensorTMini.java b/altoslib/AltosSensorTMini.java
deleted file mode 100644
index 073144d4..00000000
--- a/altoslib/AltosSensorTMini.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright © 2012 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; 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
- * 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_11;
-
-import java.util.concurrent.TimeoutException;
-
-public class AltosSensorTMini {
-	public int	tick;
-	public int	apogee;
-	public int	main;
-	public int	batt;
-
-	static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException {
-		try {
-			AltosSensorTMini	sensor_tmini = new AltosSensorTMini(link);
-
-			if (sensor_tmini == null)
-				return;
-			state.set_battery_voltage(AltosConvert.tele_mini_voltage(sensor_tmini.batt));
-			state.set_apogee_voltage(AltosConvert.tele_mini_voltage(sensor_tmini.apogee));
-			state.set_main_voltage(AltosConvert.tele_mini_voltage(sensor_tmini.main));
-
-		} catch (TimeoutException te) {
-		}
-	}
-
-	public AltosSensorTMini(AltosLink link) throws InterruptedException, TimeoutException {
-		String[] items = link.adc();
-		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("apogee:")) {
-				apogee = Integer.parseInt(items[i+1]);
-				i += 2;
-				continue;
-			}
-			if (items[i].equals("main:")) {
-				main = Integer.parseInt(items[i+1]);
-				i += 2;
-				continue;
-			}
-			if (items[i].equals("batt:")) {
-				batt = Integer.parseInt(items[i+1]);
-				i += 2;
-				continue;
-			}
-			i++;
-		}
-	}
-}
-