X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=micropeak%2FMicroData.java;h=d502b9f7fdb001473775d034e11bfe54af838307;hb=fd738d47bbc46d36698350d5450abe1125d990a3;hp=4c0ed4c3312bf1de84e5a6947f5d1e1865e9837b;hpb=2120d362cefceba69e75996b6391d9558978c01d;p=fw%2Faltos

diff --git a/micropeak/MicroData.java b/micropeak/MicroData.java
index 4c0ed4c3..d502b9f7 100644
--- a/micropeak/MicroData.java
+++ b/micropeak/MicroData.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
@@ -20,8 +21,8 @@ package org.altusmetrum.micropeak;
 import java.lang.*;
 import java.io.*;
 import java.util.*;
-import org.altusmetrum.altoslib_1.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
 class MicroIterator implements Iterator<MicroDataPoint> {
 	int		i;
@@ -97,16 +98,24 @@ public class MicroData implements AltosUIDataSet {
 	private double		time_step;
 	private double		ground_altitude;
 	private ArrayList<Integer>	bytes;
+	public int		log_id;
 	String			name;
 	MicroStats		stats;
-	
-	class FileEndedException extends Exception {
+
+	public static final int LOG_ID_MICROPEAK = 0;
+	public static final int LOG_ID_MICROKITE = 1;
+	public static final int LOG_ID_MICROPEAK2 = 2;
+
+	public static final double CLOCK_MP1 = 0.096;
+	public static final double CLOCK_MP2 = 0.1;
+
+	public class FileEndedException extends Exception {
 	}
 
-	class NonHexcharException extends Exception {
+	public class NonHexcharException extends Exception {
 	}
 
-	class InvalidCrcException extends Exception {
+	public class InvalidCrcException extends Exception {
 	}
 
 	private int getc(InputStream f) throws IOException, FileEndedException {
@@ -167,16 +176,12 @@ public class MicroData implements AltosUIDataSet {
 		return h;
 	}
 
-	private boolean find_header(InputStream f) throws IOException {
-		try {
-			for (;;) {
-				if (get_nonwhite(f) == 'M' && get_nonwhite(f) == 'P')
-					return true;
-			}
-		} catch (FileEndedException fe) {
-			return false;
+	private boolean find_header(InputStream f) throws IOException, FileEndedException {
+		for (;;) {
+			if (get_nonwhite(f) == 'M' && get_nonwhite(f) == 'P')
+				return true;
 		}
-	} 
+	}
 
 	private int get_32(InputStream f)  throws IOException, FileEndedException, NonHexcharException {
 		int	v = 0;
@@ -339,7 +344,7 @@ public class MicroData implements AltosUIDataSet {
 		this.name = name;
 	}
 
-	public MicroData (InputStream f, String name) throws IOException, InterruptedException {
+	public MicroData (InputStream f, String name) throws IOException, InterruptedException, NonHexcharException, FileEndedException {
 		this.name = name;
 		bytes = new ArrayList<Integer>();
 		if (!find_header(f))
@@ -349,6 +354,9 @@ public class MicroData implements AltosUIDataSet {
 			ground_pressure = get_32(f);
 			min_pressure = get_32(f);
 			int nsamples = get_16(f);
+
+			log_id = nsamples >> 12;
+			nsamples &= 0xfff;
 			pressures = new int[nsamples + 1];
 
 			ground_altitude = AltosConvert.pressure_to_altitude(ground_pressure);
@@ -371,7 +379,7 @@ public class MicroData implements AltosUIDataSet {
 					else
 						cur = down;
 				}
-				
+
 				pressures[i+1] = cur;
 			}
 
@@ -380,12 +388,22 @@ public class MicroData implements AltosUIDataSet {
 
 			crc_valid = crc == current_crc;
 
-			time_step = 0.192;
+			switch (log_id) {
+			case LOG_ID_MICROPEAK:
+				time_step = 2 * CLOCK_MP1;
+				break;
+			case LOG_ID_MICROKITE:
+				time_step = 200 * CLOCK_MP1;
+				break;
+			case LOG_ID_MICROPEAK2:
+				time_step = CLOCK_MP2;
+				break;
+			default:
+				throw new IOException(String.format("Unknown device type: %d", log_id));
+			}
 			stats = new MicroStats(this);
 		} catch (FileEndedException fe) {
 			throw new IOException("File Ended Unexpectedly");
-		} catch (NonHexcharException ne) {
-			throw new IOException("Non hexadecimal character found");
 		}
 	}
 
@@ -395,5 +413,5 @@ public class MicroData implements AltosUIDataSet {
 		pressures = new int[1];
 		pressures[0] = 101000;
 	}
-	
+
 }