X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosSensorTMini.java;h=073144d4d9a94033ee8f03b2828d39c333b01ec0;hb=826ad792389150ea8d80e341cb8ea023db83c9a2;hp=be071e5d1ea36e0e7a9c2b433d5e6a826ea11dac;hpb=3bf7ed1761e08d0cb43b0ed330226ec38c844591;p=fw%2Faltos

diff --git a/altoslib/AltosSensorTMini.java b/altoslib/AltosSensorTMini.java
index be071e5d..073144d4 100644
--- a/altoslib/AltosSensorTMini.java
+++ b/altoslib/AltosSensorTMini.java
@@ -3,7 +3,8 @@
  *
  * 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.
+ * 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
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_11;
 
 import java.util.concurrent.TimeoutException;
 
@@ -25,18 +26,17 @@ public class AltosSensorTMini {
 	public int	main;
 	public int	batt;
 
-	static public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) {
+	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.easy_mini_voltage(sensor_tmini.batt));
-			state.set_apogee_voltage(AltosConvert.easy_mini_voltage(sensor_tmini.apogee));
-			state.set_main_voltage(AltosConvert.easy_mini_voltage(sensor_tmini.main));
-			
+			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) {
-		} catch (InterruptedException ie) {
 		}
 	}