projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Move temp GPS API from cal_data to data_listener
[fw/altos]
/
altoslib
/
AltosEepromRecord.java
diff --git
a/altoslib/AltosEepromRecord.java
b/altoslib/AltosEepromRecord.java
index 08f7ebcad68922caaee2f1659d275f867fcb66dc..12519e6b91c1b47beff90c731765e9646c4b9ec1 100644
(file)
--- a/
altoslib/AltosEepromRecord.java
+++ b/
altoslib/AltosEepromRecord.java
@@
-12,11
+12,11
@@
* General Public License for more details.
*/
* General Public License for more details.
*/
-package org.altusmetrum.altoslib_1
1
;
+package org.altusmetrum.altoslib_1
2
;
public abstract class AltosEepromRecord implements Comparable<AltosEepromRecord> {
public abstract class AltosEepromRecord implements Comparable<AltosEepromRecord> {
- AltosEeprom
New
eeprom;
+ AltosEeprom
eeprom;
int wide_tick;
int wide_tick;
@@
-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;
@@
-83,16
+83,23
@@
public abstract class AltosEepromRecord implements Comparable<AltosEepromRecord>
/* AltosDataProvider */
public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
/* AltosDataProvider */
public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
-
cal_data
.set_tick(tick());
+
listener
.set_tick(tick());
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 = listener.temp_gps();
+ if (gps != null)
+ listener.set_gps(gps);
+ }
}
public int next_start() {
int s = start + length;
}
public int next_start() {
int s = start + length;
- while (s + length < eeprom.data.size()) {
+ while (s + length <
=
eeprom.data.size()) {
if (valid(s))
return s;
s += length;
if (valid(s))
return s;
s += length;
@@
-106,7
+113,7
@@
public abstract class AltosEepromRecord implements Comparable<AltosEepromRecord>
public abstract AltosEepromRecord next();
public abstract AltosEepromRecord next();
- public AltosEepromRecord(AltosEeprom
New
eeprom, int start, int length) {
+ public AltosEepromRecord(AltosEeprom eeprom, int start, int length) {
this.eeprom = eeprom;
this.start = start;
this.length = length;
this.eeprom = eeprom;
this.start = start;
this.length = length;