X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMicroData.java;fp=micropeak%2FMicroData.java;h=d502b9f7fdb001473775d034e11bfe54af838307;hp=b45ad2c18d9c6215896b185739bb97e71a32e55b;hb=6813f48fe02ecc5902f386234535ea76af71a764;hpb=a59c3afa23e876362dc8c80559015ce361627f05 diff --git a/micropeak/MicroData.java b/micropeak/MicroData.java index b45ad2c1..d502b9f7 100644 --- a/micropeak/MicroData.java +++ b/micropeak/MicroData.java @@ -104,8 +104,10 @@ public class MicroData implements AltosUIDataSet { 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 { } @@ -388,11 +390,16 @@ public class MicroData implements AltosUIDataSet { 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) {