diff options
| author | Keith Packard <keithp@keithp.com> | 2012-09-09 13:03:47 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-09-09 13:03:47 -0700 |
| commit | e2b458a448106ba1ab207f0ea6824b56927d8547 (patch) | |
| tree | 0a326ef0e6ceb34cfa1aedf43ee341881b0bf269 /altoslib/AltosTelemetryRecordLegacy.java | |
| parent | 9682e9e6fe730417a77b47795fbe1f06c9a51177 (diff) | |
| parent | 3fe932206f40f4d6f83a4ef49e064109a7a3de92 (diff) | |
Merge remote-tracking branch 'mjb/altoslib_mjb'
Diffstat (limited to 'altoslib/AltosTelemetryRecordLegacy.java')
| -rw-r--r-- | altoslib/AltosTelemetryRecordLegacy.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/altoslib/AltosTelemetryRecordLegacy.java b/altoslib/AltosTelemetryRecordLegacy.java index 3976a07a..21176069 100644 --- a/altoslib/AltosTelemetryRecordLegacy.java +++ b/altoslib/AltosTelemetryRecordLegacy.java @@ -17,9 +17,7 @@ package org.altusmetrum.AltosLib; -import java.lang.*; import java.text.*; -import java.util.HashMap; /* * Telemetry data contents @@ -394,9 +392,11 @@ public class AltosTelemetryRecordLegacy extends AltosTelemetryRecord { int[] bytes; int adjust; + /* private int int8(int i) { return AltosLib.int8(bytes, i + 1 + adjust); } + */ private int uint8(int i) { return AltosLib.uint8(bytes, i + 1 + adjust); } @@ -478,7 +478,7 @@ public class AltosTelemetryRecordLegacy extends AltosTelemetryRecord { record.gps = new AltosGPS(); record.new_gps = true; - record.seen |= record.seen_gps_time | record.seen_gps_lat | record.seen_gps_lon; + record.seen |= AltosRecord.seen_gps_time | AltosRecord.seen_gps_lat | AltosRecord.seen_gps_lon; record.gps.nsat = (gps_flags & AO_GPS_NUM_SAT_MASK); record.gps.locked = (gps_flags & AO_GPS_VALID) != 0; record.gps.connected = true; |