X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosEepromDownload.java;h=82f01ef52ea360dc53dc59ecda51203777c5067a;hp=1da94a6769ca191a0b5e6eefa0149003e44a307d;hb=0e67b6890dd3a06665239f8dfd2e69266d055e46;hpb=249cd3b63d97581b068fff988e0cd7fcd5bf493e

diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java
index 1da94a67..82f01ef5 100644
--- a/altosui/AltosEepromDownload.java
+++ b/altosui/AltosEepromDownload.java
@@ -78,11 +78,119 @@ public class AltosEepromDownload implements Runnable {
 		}
 	}
 
+	void Log(AltosEepromRecord r) throws IOException {
+		if (r.cmd != Altos.AO_LOG_INVALID) {
+			String log_line = String.format("%c %4x %4x %4x\n",
+							r.cmd, r.tick, r.a, r.b);
+			if (eeprom_file != null)
+				eeprom_file.write(log_line);
+			else
+				eeprom_pending.add(log_line);
+		}
+	}
+
+	static final int	log_full = 1;
+	static final int	log_tiny = 2;
+
+	boolean			done;
+	int			state;
+
+	void CaptureFull(AltosEepromChunk eechunk) throws IOException {
+		boolean	any_valid = false;
+		for (int i = 0; i < eechunk.chunk_size && !done; i += AltosEepromRecord.record_length) {
+			try {
+				AltosEepromRecord r = new AltosEepromRecord(eechunk, i);
+				if (r.cmd == Altos.AO_LOG_FLIGHT) {
+					flight = r.b;
+					monitor.set_flight(flight);
+				}
+
+				/* Monitor state transitions to update display */
+				if (r.cmd == Altos.AO_LOG_STATE && r.a <= Altos.ao_flight_landed) {
+					state = r.a;
+					if (state > Altos.ao_flight_pad)
+						want_file = true;
+				}
+
+				if (r.cmd == Altos.AO_LOG_GPS_DATE) {
+					year = 2000 + (r.a & 0xff);
+					month = (r.a >> 8) & 0xff;
+					day = (r.b & 0xff);
+					want_file = true;
+				}
+				if (r.cmd == Altos.AO_LOG_STATE && r.a == Altos.ao_flight_landed)
+					done = true;
+				any_valid = true;
+				Log(r);
+			} catch (ParseException pe) {
+				if (parse_exception == null)
+					parse_exception = pe;
+			}
+		}
+
+		if (!any_valid)
+			done = true;
+
+		CheckFile(false);
+	}
+
+	boolean	start;
+	int	tiny_tick;
+
+	void CaptureTiny (AltosEepromChunk eechunk) throws IOException {
+		boolean any_valid = false;
+
+		for (int i = 0; i < eechunk.data.length && !done; i += 2) {
+			int			v = eechunk.data16(i);
+			AltosEepromRecord	r;
+
+			if (i == 0 && start) {
+				tiny_tick = 0;
+				start = false;
+				flight = v;
+				monitor.set_flight(flight);
+				r = new AltosEepromRecord(Altos.AO_LOG_FLIGHT, tiny_tick, 0, v);
+				any_valid = true;
+			} else {
+				int	s = v ^ 0x8000;
+
+				if (Altos.ao_flight_startup <= s && s <= Altos.ao_flight_invalid) {
+					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_PRESSURE, tiny_tick, 0, v);
+
+					/*
+					 * The flight software records ascent data every 100ms, and descent
+					 * data every 1s.
+					 */
+					if (state < Altos.ao_flight_drogue)
+						tiny_tick += 10;
+					else
+						tiny_tick += 100;
+				}
+			}
+			Log(r);
+		}
+		CheckFile(false);
+		if (!any_valid)
+			done = true;
+	}
+
 	void CaptureLog(AltosEepromLog log) throws IOException, InterruptedException, TimeoutException {
 		int			block, state_block = 0;
-		int			state = 0;
-		boolean			done = false;
-		int			record;
+		int			log_style = 0;
+
+		state = 0;
+		done = false;
+		start = true;
 
 		if (flights.config_data.serial == 0)
 			throw new IOException("no serial number found");
@@ -104,47 +212,26 @@ public class AltosEepromDownload implements Runnable {
 		for (block = log.start_block; !done && block < log.end_block; block++) {
 			monitor.set_value(Altos.state_to_string[state], state, block - state_block);
 
-			AltosEepromBlock	eeblock = new AltosEepromBlock(serial_line, block);
-
-			if (eeblock.has_flight) {
-				flight = eeblock.flight;
-				monitor.set_flight(flight);
-			}
-			if (eeblock.has_date) {
-				year = eeblock.year;
-				month = eeblock.month;
-				day = eeblock.day;
-				want_file = true;
-			}
+			AltosEepromChunk	eechunk = new AltosEepromChunk(serial_line, block);
 
-			if (eeblock.size() == 0 ||
-			    eeblock.has_state && eeblock.state == Altos.ao_flight_landed)
-					done = true;
+			/*
+			 * Figure out what kind of data is there
+			 */
 
-			/* Monitor state transitions to update display */
-			if (eeblock.has_state) {
-				if (eeblock.state > Altos.ao_flight_pad)
-					want_file = true;
-				if (eeblock.state > state)
-					state = eeblock.state;
+			if (block == log.start_block) {
+				if (eechunk.data(0) == Altos.AO_LOG_FLIGHT)
+					log_style = log_full;
+				else
+					log_style = log_tiny;
 			}
 
-			if (parse_exception == null && eeblock.parse_exception != null)
-				parse_exception = eeblock.parse_exception;
-
-			CheckFile(false);
-
-			for (record = 0; record < eeblock.size(); record++) {
-				AltosEepromRecord r = eeblock.get(record);
-
-				if (r.cmd != Altos.AO_LOG_INVALID) {
-					String log_line = String.format("%c %4x %4x %4x\n",
-									r.cmd, r.tick, r.a, r.b);
-					if (eeprom_file != null)
-						eeprom_file.write(log_line);
-					else
-						eeprom_pending.add(log_line);
-				}
+			switch (log_style) {
+			case log_full:
+				CaptureFull(eechunk);
+				break;
+			case log_tiny:
+				CaptureTiny(eechunk);
+				break;
 			}
 		}
 		CheckFile(true);
@@ -244,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;