projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'new-debian' into debian
[fw/altos]
/
altoslib
/
AltosTelemetryRecordMegaSensor.java
diff --git
a/altoslib/AltosTelemetryRecordMegaSensor.java
b/altoslib/AltosTelemetryRecordMegaSensor.java
index 85a32d12c8d4283125b54597d8b9dd1f9e725e76..93c001ded0c85e8323129c4b02a852067d3ae052 100644
(file)
--- a/
altoslib/AltosTelemetryRecordMegaSensor.java
+++ b/
altoslib/AltosTelemetryRecordMegaSensor.java
@@
-57,7
+57,6
@@
public class AltosTelemetryRecordMegaSensor extends AltosTelemetryRecordRaw {
mag_z = int16(30);
rssi = in_rssi;
mag_z = int16(30);
rssi = in_rssi;
- System.out.printf ("telem record accel: %d\n", accel);
}
public AltosRecord update_state(AltosRecord previous) {
}
public AltosRecord update_state(AltosRecord previous) {
@@
-65,14
+64,11
@@
public class AltosTelemetryRecordMegaSensor extends AltosTelemetryRecordRaw {
AltosRecordMM next;
if (!(n instanceof AltosRecordMM)) {
AltosRecordMM next;
if (!(n instanceof AltosRecordMM)) {
- System.out.printf("sensor making MM\n");
next = new AltosRecordMM(n);
} else {
next = new AltosRecordMM(n);
} else {
- System.out.printf("sensor has MM\n");
next = (AltosRecordMM) n;
}
next = (AltosRecordMM) n;
}
- System.out.printf("telem update_state accel: %d\n", accel);
next.accel = accel;
next.pres = pres;
next.temp = temp;
next.accel = accel;
next.pres = pres;
next.temp = temp;