projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Handle EasyMini v2.0 ADC values
[fw/altos]
/
altoslib
/
AltosEepromRecord.java
diff --git
a/altoslib/AltosEepromRecord.java
b/altoslib/AltosEepromRecord.java
index 7dd3759233d888b12a989e5c8bd9cc4761fe35c8..75fe5381f51b1c9e57de5b85cc846969b55927d5 100644
(file)
--- a/
altoslib/AltosEepromRecord.java
+++ b/
altoslib/AltosEepromRecord.java
@@
-74,7
+74,7
@@
public abstract class AltosEepromRecord implements Comparable<AltosEepromRecord>
if (cmd_diff != 0)
return cmd_diff;
if (cmd_diff != 0)
return cmd_diff;
- int tick_diff =
tick() - o.tick()
;
+ int tick_diff =
wide_tick - o.wide_tick
;
if (tick_diff != 0)
return tick_diff;
if (tick_diff != 0)
return tick_diff;
@@
-87,6
+87,15
@@
public abstract class AltosEepromRecord implements Comparable<AltosEepromRecord>
if (cmd() == AltosLib.AO_LOG_FLIGHT)
cal_data.set_boost_tick();
listener.set_time(cal_data.time());
if (cmd() == AltosLib.AO_LOG_FLIGHT)
cal_data.set_boost_tick();
listener.set_time(cal_data.time());
+
+ /* Flush any pending GPS changes */
+ if (!AltosLib.is_gps_cmd(cmd())) {
+ AltosGPS gps = cal_data.temp_gps();
+ if (gps != null) {
+ listener.set_gps(gps);
+ cal_data.reset_temp_gps();
+ }
+ }
}
public int next_start() {
}
public int next_start() {