projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
micropeak: Add MicroPeak V2 to the download code
[fw/altos]
/
micropeak
/
MicroData.java
diff --git
a/micropeak/MicroData.java
b/micropeak/MicroData.java
index b45ad2c18d9c6215896b185739bb97e71a32e55b..d502b9f7fdb001473775d034e11bfe54af838307 100644
(file)
--- 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_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 {
}
public class FileEndedException extends Exception {
}
@@
-388,11
+390,16
@@
public class MicroData implements AltosUIDataSet {
switch (log_id) {
case LOG_ID_MICROPEAK:
switch (log_id) {
case LOG_ID_MICROPEAK:
- time_step = 2 * CLOCK;
+ time_step = 2 * CLOCK
_MP1
;
break;
case LOG_ID_MICROKITE:
break;
case LOG_ID_MICROKITE:
- time_step = 200 * CLOCK;
+ time_step = 200 * CLOCK
_MP1
;
break;
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) {
}
stats = new MicroStats(this);
} catch (FileEndedException fe) {