X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosMs5607.java;h=81e0641c2d9a8f42301dffbfba4fb29483ca8e49;hp=b29fa9ae845d11ad4652448f4627587ae062027e;hb=c8078d352a7f54a4a97d25af080155d3f875536a;hpb=5b976a6651f4eb05d30afc08b9e1f27c7e52ae00

diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java
index b29fa9ae..81e0641c 100644
--- a/altoslib/AltosMs5607.java
+++ b/altoslib/AltosMs5607.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_5;
 
 import java.util.concurrent.*;
 
@@ -44,7 +44,7 @@ public class AltosMs5607 {
 		//int P;
 
 		dT = raw_temp - ((int) tref << 8);
-	
+
 		TEMP = (int) (2000 + (((long) dT * (long) tempsens) >> 23));
 
 		if (ms5611) {
@@ -55,7 +55,7 @@ public class AltosMs5607 {
 			OFF = ((long) off << 17) + (((long) tco * (long) dT) >> 6);
 
 			SENS = ((long) sens << 16) + (((long) tcs * (long) dT) >> 7);
-		} 
+		}
 
 		if (TEMP < 2000) {
 			int	T2 = (int) (((long) dT * (long) dT) >> 31);
@@ -85,12 +85,10 @@ public class AltosMs5607 {
 	}
 
 	public boolean parse_line(String line) {
-		System.out.printf ("parse %s\n", line);
 		String[] items = line.split("\\s+");
 		if (line.startsWith("Pressure:")) {
 			if (items.length >= 2) {
 				raw_pres = Integer.parseInt(items[1]);
-				System.out.printf ("raw_pres %d\n", raw_pres);
 			}
 		} else if (line.startsWith("Temperature:")) {
 			if (items.length >= 2)
@@ -99,10 +97,8 @@ public class AltosMs5607 {
 			if (items.length >= 3)
 				reserved = Integer.parseInt(items[2]);
 		} else if (line.startsWith("ms5607 sens:")) {
-			System.out.printf ("found sens length %d\n", items.length);
 			if (items.length >= 3) {
 				sens = Integer.parseInt(items[2]);
-				System.out.printf ("sens %d\n", sens);
 			}
 		} else if (line.startsWith("ms5607 off:")) {
 			if (items.length >= 3)
@@ -128,7 +124,7 @@ public class AltosMs5607 {
 		return true;
 	}
 
-	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 {
 			AltosMs5607	ms5607 = new AltosMs5607(link);
 
@@ -137,7 +133,6 @@ public class AltosMs5607 {
 				return;
 			}
 		} catch (TimeoutException te) {
-		} catch (InterruptedException ie) {
 		}
 	}
 
@@ -157,13 +152,9 @@ public class AltosMs5607 {
 				throw new TimeoutException();
 			}
 			if (!parse_line(line)) {
-				System.out.printf ("stop parsing at %s\n", line);
 				break;
 			}
 		}
-		System.out.printf ("sens %d off %d tcs %d tco %d tref %d tempsens %d crc %d pres %d temp %d\n",
-				   sens, off, tcs, tco, tref, tempsens, crc, raw_pres, raw_temp);
 		convert();
-		System.out.printf ("pa %d cc %d\n", pa, cc);
 	}
 }