projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao-tools. Oops, let 'ao-mega' slip into build.
[fw/altos]
/
altoslib
/
AltosTelemetryRecordMegaData.java
diff --git
a/altoslib/AltosTelemetryRecordMegaData.java
b/altoslib/AltosTelemetryRecordMegaData.java
index cc35cd834c535947e773763c96ff9b3255cc3ef4..98b9f4c5e435747299824d71f2572719b9822a77 100644
(file)
--- a/
altoslib/AltosTelemetryRecordMegaData.java
+++ b/
altoslib/AltosTelemetryRecordMegaData.java
@@
-65,10
+65,8
@@
public class AltosTelemetryRecordMegaData extends AltosTelemetryRecordRaw {
AltosRecordMM next;
if (!(n instanceof AltosRecordMM)) {
AltosRecordMM next;
if (!(n instanceof AltosRecordMM)) {
- System.out.printf("data making record MM\n");
next = new AltosRecordMM(n);
} else {
next = new AltosRecordMM(n);
} else {
- System.out.printf ("data already has MM\n");
next = (AltosRecordMM) n;
}
next = (AltosRecordMM) n;
}
@@
-85,11
+83,11
@@
public class AltosTelemetryRecordMegaData extends AltosTelemetryRecordRaw {
next.accel_plus_g = accel_plus_g;
next.accel_minus_g = accel_minus_g;
next.accel_plus_g = accel_plus_g;
next.accel_minus_g = accel_minus_g;
- next.acceleration = acceleration / 16.0;
- next.speed = speed / 16.0;
- next.height = height;
+ next.
kalman_
acceleration = acceleration / 16.0;
+ next.
kalman_
speed = speed / 16.0;
+ next.
kalman_
height = height;
- next.seen |= AltosRecord.seen_
flight
| AltosRecord.seen_temp_volt;
+ next.seen |= AltosRecord.seen_
sensor
| AltosRecord.seen_temp_volt;
return next;
}
return next;
}