projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stop doing automatic tag push during builds
[fw/altos]
/
altosui
/
AltosEepromLog.java
diff --git
a/altosui/AltosEepromLog.java
b/altosui/AltosEepromLog.java
index f7fb39e1e19c33e91ab0ee314007132c17bf212c..0cf420d9c7d2a45b5bf89abb4d32bbfa551c45a0 100644
(file)
--- a/
altosui/AltosEepromLog.java
+++ b/
altosui/AltosEepromLog.java
@@
-47,7
+47,8
@@
public class AltosEepromLog {
boolean delete;
public AltosEepromLog(AltosSerial serial_line, int in_serial,
boolean delete;
public AltosEepromLog(AltosSerial serial_line, int in_serial,
- int in_start_block, int in_end_block)
+ int in_flight, int in_start_block,
+ int in_end_block)
throws InterruptedException, TimeoutException {
int block;
throws InterruptedException, TimeoutException {
int block;
@@
-73,8
+74,8
@@
public class AltosEepromLog {
AltosEepromChunk eechunk = new AltosEepromChunk(serial_line, block);
if (block == in_start_block) {
AltosEepromChunk eechunk = new AltosEepromChunk(serial_line, block);
if (block == in_start_block) {
- if (eechunk.data
(0) != Altos.AO_LOG_FLIGHT
) {
- flight =
eechunk.data16(0)
;
+ if (eechunk.data
16(0) == in_flight
) {
+ flight =
in_flight
;
has_flight = true;
break;
}
has_flight = true;
break;
}