*
* 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
import java.lang.*;
import java.io.*;
import java.util.*;
-import org.altusmetrum.altoslib_6.*;
-import org.altusmetrum.altosuilib_6.*;
+import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altosuilib_11.*;
class MicroIterator implements Iterator<MicroDataPoint> {
int i;
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 = 0.096;
+ public static final double CLOCK_MP1 = 0.096;
+ public static final double CLOCK_MP2 = 0.1;
public class FileEndedException extends Exception {
}
switch (log_id) {
case LOG_ID_MICROPEAK:
- time_step = 2 * CLOCK;
+ time_step = 2 * CLOCK_MP1;
break;
case LOG_ID_MICROKITE:
- time_step = 200 * CLOCK;
+ 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) {