Merge branch 'telemini' into telebt
authorKeith Packard <keithp@keithp.com>
Tue, 19 Apr 2011 21:06:39 +0000 (14:06 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 19 Apr 2011 21:06:39 +0000 (14:06 -0700)
1  2 
altosui/Altos.java
altosui/AltosEepromDownload.java
src/ao_pins.h

Simple merge
@@@ -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)
diff --cc src/ao_pins.h
Simple merge