X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosEepromDownload.java;h=82f01ef52ea360dc53dc59ecda51203777c5067a;hp=a03d2b43c952e963cc470a947c25c9bce0c268ec;hb=5e111fdf1f23203baeeb490ae1b69402ebd513b8;hpb=b155647472ddfacb07c5ffa832e4d1f4a13ad342

diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java
index a03d2b43..82f01ef5 100644
--- a/altosui/AltosEepromDownload.java
+++ b/altosui/AltosEepromDownload.java
@@ -155,14 +155,17 @@ public class AltosEepromDownload implements Runnable {
 				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)
 						any_valid = true;
-					r = new AltosEepromRecord(Altos.AO_LOG_HEIGHT, tiny_tick, v, 0);
+
+					r = new AltosEepromRecord(Altos.AO_LOG_PRESSURE, tiny_tick, 0, v);
 
 					/*
 					 * The flight software records ascent data every 100ms, and descent
@@ -328,6 +331,7 @@ public class AltosEepromDownload implements Runnable {
 
 		frame = given_frame;
 		serial_line = given_serial_line;
+		serial_line.set_frame(frame);
 		remote = given_remote;
 		flights = given_flights;
 		success = false;