projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into branch-1.6
[fw/altos]
/
altoslib
/
AltosEeprom.java
diff --git
a/altoslib/AltosEeprom.java
b/altoslib/AltosEeprom.java
index 081b3be1fa971d96f530b485c51b318a7db4cfcc..194b10e801d3f9c96c7ef168ed7dfaad3c46e791 100644
(file)
--- a/
altoslib/AltosEeprom.java
+++ b/
altoslib/AltosEeprom.java
@@
-15,7
+15,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
1
;
+package org.altusmetrum.altoslib_
8
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-43,11
+43,20
@@
public abstract class AltosEeprom implements AltosStateUpdate {
return data8[i] | (data8[i+1] << 8) | (data8[i+2] << 16) | (data8[i+3] << 24);
}
return data8[i] | (data8[i+1] << 8) | (data8[i+2] << 16) | (data8[i+3] << 24);
}
+ public boolean has_seconds() { return false; }
+
+ public int seconds() { return 0; }
+
public final static int header_length = 4;
public abstract int record_length();
public final static int header_length = 4;
public abstract int record_length();
- public abstract void update_state(AltosState state);
+ public void update_state(AltosState state) {
+ if (cmd == AltosLib.AO_LOG_FLIGHT)
+ state.set_boost_tick(tick);
+ else
+ state.set_tick(tick);
+ }
public void write(PrintStream out) {
out.printf("%c %04x", cmd, tick);
public void write(PrintStream out) {
out.printf("%c %04x", cmd, tick);