projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib/altosui: Further AltosState transition work
[fw/altos]
/
altosui
/
AltosDisplayThread.java
diff --git
a/altosui/AltosDisplayThread.java
b/altosui/AltosDisplayThread.java
index 70144fb2a5b3ab3a1675aacf9b1f7571263642c0..7a750c86be06b5680ec5b7f79ee43dd546fa3eb6 100644
(file)
--- a/
altosui/AltosDisplayThread.java
+++ b/
altosui/AltosDisplayThread.java
@@
-110,7
+110,7
@@
public class AltosDisplayThread extends Thread {
*/
if (state.state >= Altos.ao_flight_drogue &&
(last ||
*/
if (state.state >= Altos.ao_flight_drogue &&
(last ||
- System.currentTimeMillis() - state.re
port
_time >= 15000 ||
+ System.currentTimeMillis() - state.re
ceived
_time >= 15000 ||
state.state == Altos.ao_flight_landed))
{
if (Math.abs(state.speed) < 20 && state.height < 100)
state.state == Altos.ao_flight_landed))
{
if (Math.abs(state.speed) < 20 && state.height < 100)