projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosuilib: Deal with AltosUnits API change
[fw/altos]
/
altoslib
/
AltosState.java
diff --git
a/altoslib/AltosState.java
b/altoslib/AltosState.java
index a01cddb774d1a5a567d10869a80ee669fe783938..6d55b833b83a5bf1a8878d10d6e45b539a71b088 100644
(file)
--- a/
altoslib/AltosState.java
+++ b/
altoslib/AltosState.java
@@
-836,7
+836,9
@@
public class AltosState implements Cloneable {
if (flight != AltosLib.MISSING && flight != 0) {
if (this.flight != AltosLib.MISSING &&
this.flight != flight) {
if (flight != AltosLib.MISSING && flight != 0) {
if (this.flight != AltosLib.MISSING &&
this.flight != flight) {
+ int bt = boost_tick;
init();
init();
+ boost_tick = bt;
}
this.flight = flight;
}
}
this.flight = flight;
}
@@
-847,7
+849,9
@@
public class AltosState implements Cloneable {
if (serial != AltosLib.MISSING) {
if (this.serial != AltosLib.MISSING &&
this.serial != serial) {
if (serial != AltosLib.MISSING) {
if (this.serial != AltosLib.MISSING &&
this.serial != serial) {
+ int bt = boost_tick;
init();
init();
+ boost_tick = bt;
}
this.serial = serial;
}
}
this.serial = serial;
}
@@
-1017,10
+1021,9
@@
public class AltosState implements Cloneable {
if (tick == AltosLib.MISSING)
return 0.0;
if (tick == AltosLib.MISSING)
return 0.0;
- if (boost_tick != AltosLib.MISSING) {
- return (tick - boost_tick) / 100.0;
- }
- return tick / 100.0;
+ if (boost_tick == AltosLib.MISSING)
+ return tick / 100.0;
+ return (tick - boost_tick) / 100.0;
}
public boolean valid() {
}
public boolean valid() {