From: Keith Packard <keithp@keithp.com>
Date: Tue, 19 Apr 2011 21:06:39 +0000 (-0700)
Subject: Merge branch 'telemini' into telebt
X-Git-Tag: 0.9.3~50
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=44fb71ca3e5bccd5f601fc5a2d5da7292050b1d6

Merge branch 'telemini' into telebt
---

44fb71ca3e5bccd5f601fc5a2d5da7292050b1d6
diff --cc altosui/AltosEepromDownload.java
index 5c704968,3dd5b12f..82f01ef5
--- a/altosui/AltosEepromDownload.java
+++ b/altosui/AltosEepromDownload.java
@@@ -155,10 -155,10 +155,11 @@@ public class AltosEepromDownload implem
  				int	s = v ^ 0x8000;
  
  				if (Altos.ao_flight_startup <= s && s <= Altos.ao_flight_invalid) {
- 					r = new AltosEepromRecord(Altos.AO_LOG_STATE, tiny_tick, s, 0);
- 					if (s == Altos.ao_flight_landed)
+ 					state = s;
+ 					r = new AltosEepromRecord(Altos.AO_LOG_STATE, tiny_tick, state, 0);
+ 					if (state == Altos.ao_flight_landed)
  						done = true;
 +					state = s;
  					any_valid = true;
  				} else {
  					if (v != 0xffff)