X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosEepromDownload.java;h=a0523b58a2c00ea8734c614479994a617ef6249d;hp=82f01ef52ea360dc53dc59ecda51203777c5067a;hb=aa7eac32adf4c2cdf441991d02411758f2682d1e;hpb=44fb71ca3e5bccd5f601fc5a2d5da7292050b1d6

diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java
index 82f01ef5..a0523b58 100644
--- a/altosui/AltosEepromDownload.java
+++ b/altosui/AltosEepromDownload.java
@@ -17,18 +17,13 @@
 
 package altosui;
 
-import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
 import java.io.*;
 import java.util.*;
 import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
-
-import libaltosJNI.*;
+import org.altusmetrum.altoslib_1.*;
 
 public class AltosEepromDownload implements Runnable {
 
@@ -39,6 +34,7 @@ public class AltosEepromDownload implements Runnable {
 	AltosEepromMonitor	monitor;
 
 	int			flight;
+	int			serial;
 	int			year, month, day;
 	boolean			want_file;
 	FileWriter		eeprom_file;
@@ -48,6 +44,7 @@ public class AltosEepromDownload implements Runnable {
 	ActionListener		listener;
 	boolean			success;
 	ParseException		parse_exception;
+	String			extension;
 
 	private void FlushPending() throws IOException {
 		for (String s : flights.config_data) {
@@ -64,10 +61,13 @@ public class AltosEepromDownload implements Runnable {
 			return;
 		if (force || (flight != 0 && want_file)) {
 			AltosFile		eeprom_name;
+
+			if (extension == null)
+				extension = "data";
 			if (year != 0 && month != 0 && day != 0)
-				eeprom_name = new AltosFile(year, month, day, flights.config_data.serial, flight, "eeprom");
+				eeprom_name = new AltosFile(year, month, day, serial, flight, extension);
 			else
-				eeprom_name = new AltosFile(flights.config_data.serial, flight, "eeprom");
+				eeprom_name = new AltosFile(serial, flight, extension);
 
 			eeprom_file = new FileWriter(eeprom_name);
 			if (eeprom_file != null) {
@@ -89,21 +89,29 @@ public class AltosEepromDownload implements Runnable {
 		}
 	}
 
-	static final int	log_full = 1;
-	static final int	log_tiny = 2;
+	void set_serial(int in_serial) {
+		serial = in_serial;
+		monitor.set_serial(serial);
+	}
 
+	void set_flight(int in_flight) {
+		flight = in_flight;
+		monitor.set_flight(flight);
+	}
+		
 	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) {
+
+		extension = "eeprom";
+		set_serial(flights.config_data.serial);
+		for (int i = 0; i < AltosEepromChunk.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);
-				}
+				if (r.cmd == Altos.AO_LOG_FLIGHT)
+					set_flight(r.b);
 
 				/* Monitor state transitions to update display */
 				if (r.cmd == Altos.AO_LOG_STATE && r.a <= Altos.ao_flight_landed) {
@@ -120,7 +128,8 @@ public class AltosEepromDownload implements Runnable {
 				}
 				if (r.cmd == Altos.AO_LOG_STATE && r.a == Altos.ao_flight_landed)
 					done = true;
-				any_valid = true;
+				if (r.cmd != AltosLib.AO_LOG_INVALID)
+					any_valid = true;
 				Log(r);
 			} catch (ParseException pe) {
 				if (parse_exception == null)
@@ -140,6 +149,8 @@ public class AltosEepromDownload implements Runnable {
 	void CaptureTiny (AltosEepromChunk eechunk) throws IOException {
 		boolean any_valid = false;
 
+		extension = "eeprom";
+		set_serial(flights.config_data.serial);
 		for (int i = 0; i < eechunk.data.length && !done; i += 2) {
 			int			v = eechunk.data16(i);
 			AltosEepromRecord	r;
@@ -147,8 +158,7 @@ public class AltosEepromDownload implements Runnable {
 			if (i == 0 && start) {
 				tiny_tick = 0;
 				start = false;
-				flight = v;
-				monitor.set_flight(flight);
+				set_flight(v);
 				r = new AltosEepromRecord(Altos.AO_LOG_FLIGHT, tiny_tick, 0, v);
 				any_valid = true;
 			} else {
@@ -184,15 +194,127 @@ public class AltosEepromDownload implements Runnable {
 			done = true;
 	}
 
+	void LogTeleScience(AltosEepromTeleScience r) throws IOException {
+		if (r.type != Altos.AO_LOG_INVALID) {
+			String log_line = String.format("%c %4x %4x %d %5d %5d %5d %5d %5d %5d %5d %5d %5d %5d %5d %5d\n",
+							r.type, r.tick, r.tm_tick, r.tm_state,
+							r.data[0], r.data[1], r.data[2], r.data[3], 
+							r.data[4], r.data[5], r.data[6], r.data[7], 
+							r.data[8], r.data[9], r.data[10], r.data[11]);
+			if (eeprom_file != null)
+				eeprom_file.write(log_line);
+			else
+				eeprom_pending.add(log_line);
+		}
+	}
+	
+	boolean	telescience_start;
+
+	void CaptureTeleScience (AltosEepromChunk eechunk) throws IOException {
+		boolean	any_valid = false;
+
+		extension = "science";
+		for (int i = 0; i < AltosEepromChunk.chunk_size && !done; i += AltosEepromTeleScience.record_length) {
+			try {
+				AltosEepromTeleScience r = new AltosEepromTeleScience(eechunk, i);
+				if (r.type == AltosEepromTeleScience.AO_LOG_TELESCIENCE_START) {
+					if (telescience_start) {
+						done = true;
+						break;
+					}
+					set_serial(r.data[0]);
+					set_flight(r.data[1]);
+					telescience_start = true;
+				} else {
+					if (!telescience_start)
+						break;
+				}
+				state = r.tm_state;
+				want_file =true;
+				any_valid = true;
+				LogTeleScience(r);
+			} catch (ParseException pe) {
+				if (parse_exception == null)
+					parse_exception = pe;
+			}
+		}
+
+		CheckFile(false);
+		if (!any_valid)
+			done = true;
+	}
+
+	void LogMega(AltosEepromMega r) throws IOException {
+		if (r.cmd != Altos.AO_LOG_INVALID) {
+			String log_line = String.format("%c %4x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x %2x\n",
+							r.cmd, r.tick,
+							r.data8[0], r.data8[1], r.data8[2], r.data8[3],
+							r.data8[4], r.data8[5], r.data8[6], r.data8[7],
+							r.data8[8], r.data8[9], r.data8[10], r.data8[11],
+							r.data8[12], r.data8[13], r.data8[14], r.data8[15],
+							r.data8[16], r.data8[17], r.data8[18], r.data8[19],
+							r.data8[20], r.data8[21], r.data8[22], r.data8[23],
+							r.data8[24], r.data8[25], r.data8[26], r.data8[27]);
+			if (eeprom_file != null)
+				eeprom_file.write(log_line);
+			else
+				eeprom_pending.add(log_line);
+		}
+	}
+
+	void CaptureMega(AltosEepromChunk eechunk) throws IOException {
+		boolean any_valid = false;
+
+		extension = "mega";
+		set_serial(flights.config_data.serial);
+		for (int i = 0; i < AltosEepromChunk.chunk_size && !done; i += AltosEepromMega.record_length) {
+			try {
+				AltosEepromMega r = new AltosEepromMega(eechunk, i);
+				if (r.cmd == Altos.AO_LOG_FLIGHT)
+					set_flight(r.data16(0));
+
+				/* Monitor state transitions to update display */
+				if (r.cmd == Altos.AO_LOG_STATE && r.data16(0) <= Altos.ao_flight_landed) {
+					state = r.data16(0);
+					if (state > Altos.ao_flight_pad)
+						want_file = true;
+				}
+
+				if (r.cmd == Altos.AO_LOG_GPS_TIME) {
+					year = 2000 + r.data8(14);
+					month = r.data8(15);
+					day = r.data8(16);
+					want_file = true;
+				}
+
+				if (r.cmd == Altos.AO_LOG_STATE && r.data16(0) == Altos.ao_flight_landed)
+					done = true;
+				any_valid = true;
+				LogMega(r);
+			} catch (ParseException pe) {
+				if (parse_exception == null)
+					parse_exception = pe;
+			}
+		}
+		if (!any_valid)
+			done = true;
+
+		CheckFile(false);
+	}
+	
+	void CaptureTelemetry(AltosEepromChunk eechunk) throws IOException {
+		
+	}
+
 	void CaptureLog(AltosEepromLog log) throws IOException, InterruptedException, TimeoutException {
 		int			block, state_block = 0;
-		int			log_style = 0;
+		int			log_format = flights.config_data.log_format;
 
 		state = 0;
 		done = false;
 		start = true;
 
-		if (flights.config_data.serial == 0)
+		if (flights.config_data.serial < 0)
 			throw new IOException("no serial number found");
 
 		/* Reset per-capture variables */
@@ -205,33 +327,48 @@ public class AltosEepromDownload implements Runnable {
 		eeprom_pending = new LinkedList<String>();
 
 		/* Set serial number in the monitor dialog window */
-		monitor.set_serial(flights.config_data.serial);
 		/* Now scan the eeprom, reading blocks of data and converting to .eeprom file form */
 
 		state = 0; state_block = log.start_block;
 		for (block = log.start_block; !done && block < log.end_block; block++) {
-			monitor.set_value(Altos.state_to_string[state], state, block - state_block);
+			monitor.set_value(AltosLib.state_name(state), state, block - state_block, block - log.start_block);
 
-			AltosEepromChunk	eechunk = new AltosEepromChunk(serial_line, block);
+			AltosEepromChunk	eechunk = new AltosEepromChunk(serial_line, block, block == log.start_block);
 
 			/*
-			 * Figure out what kind of data is there
+			 * Guess what kind of data is there if the device
+			 * didn't tell us
 			 */
 
-			if (block == log.start_block) {
-				if (eechunk.data(0) == Altos.AO_LOG_FLIGHT)
-					log_style = log_full;
-				else
-					log_style = log_tiny;
+			if (log_format == Altos.AO_LOG_FORMAT_UNKNOWN) {
+				if (block == log.start_block) {
+					if (eechunk.data(0) == Altos.AO_LOG_FLIGHT)
+						log_format = Altos.AO_LOG_FORMAT_FULL;
+					else
+						log_format = Altos.AO_LOG_FORMAT_TINY;
+				}
 			}
 
-			switch (log_style) {
-			case log_full:
+			switch (log_format) {
+			case AltosLib.AO_LOG_FORMAT_FULL:
+				extension = "eeprom";
 				CaptureFull(eechunk);
 				break;
-			case log_tiny:
+			case AltosLib.AO_LOG_FORMAT_TINY:
+				extension = "eeprom";
 				CaptureTiny(eechunk);
 				break;
+			case AltosLib.AO_LOG_FORMAT_TELEMETRY:
+				extension = "telem";
+				CaptureTelemetry(eechunk);
+				break;
+			case AltosLib.AO_LOG_FORMAT_TELESCIENCE:
+				extension = "science";
+				CaptureTeleScience(eechunk);
+				break;
+			case AltosLib.AO_LOG_FORMAT_TELEMEGA:
+				extension = "mega";
+				CaptureMega(eechunk);
 			}
 		}
 		CheckFile(true);
@@ -264,14 +401,14 @@ public class AltosEepromDownload implements Runnable {
 	}
 
 	public void run () {
-		if (remote)
-			serial_line.start_remote();
-
 		try {
 			boolean	failed = false;
+			if (remote)
+				serial_line.start_remote();
+
 			for (AltosEepromLog log : flights) {
 				parse_exception = null;
-				if (log.download) {
+				if (log.selected) {
 					monitor.reset();
 					CaptureLog(log);
 				}
@@ -290,16 +427,22 @@ public class AltosEepromDownload implements Runnable {
 				     serial_line.device.toShortString(),
 				     JOptionPane.ERROR_MESSAGE);
 		} catch (InterruptedException ie) {
+			System.out.printf("download interrupted\n");
 		} catch (TimeoutException te) {
 			show_message(String.format("Connection to \"%s\" failed",
 						   serial_line.device.toShortString()),
 				     "Connection Failed",
 				     JOptionPane.ERROR_MESSAGE);
+		} finally {
+			if (remote) {
+				try {
+					serial_line.stop_remote();
+				} catch (InterruptedException ie) {
+				}
+			}
+			serial_line.flush_output();
 		}
-		if (remote)
-			serial_line.stop_remote();
 		monitor.done();
-		serial_line.flush_output();
 		if (listener != null) {
 			Runnable r = new Runnable() {
 					public void run() {