projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Export ao_fat_sync and ao_fat_full functions
[fw/altos]
/
altoslib
/
AltosState.java
diff --git
a/altoslib/AltosState.java
b/altoslib/AltosState.java
index f28dd1c6609f24070b7ba0fa4ce4e5f8f60205ed..5598a60353b9af204dd78634de0200c25d7eeb1c 100644
(file)
--- a/
altoslib/AltosState.java
+++ b/
altoslib/AltosState.java
@@
-19,7
+19,7
@@
* Track flight state from telemetry or eeprom data stream
*/
* Track flight state from telemetry or eeprom data stream
*/
-package org.altusmetrum.
AltosLib
;
+package org.altusmetrum.
altoslib_1
;
public class AltosState {
public AltosRecord data;
public class AltosState {
public AltosRecord data;
@@
-92,6
+92,9
@@
public class AltosState {
public void init (AltosRecord cur, AltosState prev_state) {
data = cur;
public void init (AltosRecord cur, AltosState prev_state) {
data = cur;
+ /* Discard previous state if it was for a different board */
+ if (prev_state != null && prev_state.data.serial != data.serial)
+ prev_state = null;
ground_altitude = data.ground_altitude();
altitude = data.altitude();
ground_altitude = data.ground_altitude();
altitude = data.altitude();
@@
-197,8
+200,10
@@
public class AltosState {
}
ngps++;
}
}
ngps++;
}
- } else
- pad_alt = ground_altitude;
+ } else {
+ if (ngps == 0)
+ pad_alt = ground_altitude;
+ }
data.new_gps = false;
data.new_gps = false;