projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/cc1111: Wake up non-ADC sensor code each timer tick
[fw/altos]
/
altoslib
/
AltosTelemetryRecordLegacy.java
diff --git
a/altoslib/AltosTelemetryRecordLegacy.java
b/altoslib/AltosTelemetryRecordLegacy.java
index 1202099adee6f28c5a842ec1283c75da8b38fbcd..f2d3f86877422afa79d8ff3b6b585f3e28047069 100644
(file)
--- a/
altoslib/AltosTelemetryRecordLegacy.java
+++ b/
altoslib/AltosTelemetryRecordLegacy.java
@@
-15,7
+15,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib;
+package org.altusmetrum.altoslib
_1
;
import java.text.*;
import java.text.*;
@@
-267,7
+267,7
@@
public class AltosTelemetryRecordLegacy extends AltosTelemetryRecord {
if (map.has(AO_TELEM_GPS_STATE)) {
record.gps = new AltosGPS(map);
if (map.has(AO_TELEM_GPS_STATE)) {
record.gps = new AltosGPS(map);
- record.
new_gps = true
;
+ record.
gps_sequence++
;
}
else
record.gps = null;
}
else
record.gps = null;
@@
-357,7
+357,7
@@
public class AltosTelemetryRecordLegacy extends AltosTelemetryRecord {
}
record.gps = new AltosGPS(words, i, record.version);
}
record.gps = new AltosGPS(words, i, record.version);
- record.
new_gps = true
;
+ record.
gps_sequence++
;
}
public AltosTelemetryRecordLegacy(String line) throws ParseException, AltosCRCException {
}
public AltosTelemetryRecordLegacy(String line) throws ParseException, AltosCRCException {
@@
-476,7
+476,7
@@
public class AltosTelemetryRecordLegacy extends AltosTelemetryRecord {
if ((gps_flags & (AO_GPS_VALID|AO_GPS_RUNNING)) != 0) {
record.gps = new AltosGPS();
if ((gps_flags & (AO_GPS_VALID|AO_GPS_RUNNING)) != 0) {
record.gps = new AltosGPS();
- record.
new_gps = true
;
+ record.
gps_sequence++
;
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.seen |= AltosRecord.seen_gps_time | AltosRecord.seen_gps_lat | AltosRecord.seen_gps_lon;
record.gps.nsat = (gps_flags & AO_GPS_NUM_SAT_MASK);