X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosEepromDownload.java;h=6e2fd061b1cbef6afe1f6ef223a118b95a57782c;hp=02fc36f298cfc6922710aaace084a6fa091e1eb0;hb=0ad95614685a73856bb26a94866909e5fc025434;hpb=51c7741040d95c5deece939dae5e4136cc04afc4

diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java
index 02fc36f2..6e2fd061 100644
--- a/altosui/AltosEepromDownload.java
+++ b/altosui/AltosEepromDownload.java
@@ -17,269 +17,289 @@
 
 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_2.*;
 
 public class AltosEepromDownload implements Runnable {
 
-	static final String[] state_names = {
-		"startup",
-		"idle",
-		"pad",
-		"boost",
-		"fast",
-		"coast",
-		"drogue",
-		"main",
-		"landed",
-		"invalid",
-	};
-
-	int[] ParseHex(String line) {
-		String[] tokens = line.split("\\s+");
-		int[] array = new int[tokens.length];
-
-		for (int i = 0; i < tokens.length; i++)
-			try {
-				array[i] = Integer.parseInt(tokens[i], 16);
-			} catch (NumberFormatException ne) {
-				return null;
-			}
-		return array;
+	JFrame			frame;
+	AltosSerial		serial_line;
+	boolean			remote;
+	Thread			eeprom_thread;
+	AltosEepromMonitor	monitor;
+
+	boolean			want_file;
+	FileWriter		eeprom_file;
+	LinkedList<String>	eeprom_pending;
+
+	AltosEepromList		flights;
+	ActionListener		listener;
+	boolean			success;
+	ParseException		parse_exception;
+	AltosState		state;
+
+	private void FlushPending() throws IOException {
+		for (String s : flights.config_data) {
+			eeprom_file.write(s);
+			eeprom_file.write('\n');
+		}
+
+		for (String s : eeprom_pending)
+			eeprom_file.write(s);
 	}
 
-	int checksum(int[] line) {
-		int	csum = 0x5a;
-		for (int i = 1; i < line.length; i++)
-			csum += line[i];
-		return csum & 0xff;
+	private void CheckFile(boolean force) throws IOException {
+		if (eeprom_file != null)
+			return;
+		if (force || (state.flight != 0 && want_file)) {
+			AltosFile		eeprom_name;
+			AltosGPS		gps = state.gps;
+
+			if (gps != null &&
+			    gps.year != AltosLib.MISSING &&
+			    gps.month != AltosLib.MISSING &&
+			    gps.day != AltosLib.MISSING)
+			{
+				eeprom_name = new AltosFile(gps.year, gps.month, gps.day,
+							    state.serial, state.flight, "eeprom");
+			} else
+				eeprom_name = new AltosFile(state.serial, state.flight, "eeprom");
+
+			eeprom_file = new FileWriter(eeprom_name);
+			if (eeprom_file != null) {
+				monitor.set_file(eeprom_name.getName());
+				FlushPending();
+				eeprom_pending = null;
+			}
+		}
 	}
 
-	void FlushPending(FileWriter file, LinkedList<String> pending) throws IOException {
-		while (!pending.isEmpty()) {
-			file.write(pending.remove());
+	boolean			done;
+	boolean			start;
+
+	void LogEeprom(AltosEeprom r) throws IOException {
+		if (r.cmd != Altos.AO_LOG_INVALID) {
+			String line = r.string();
+			if (eeprom_file != null)
+				eeprom_file.write(line);
+			else
+				eeprom_pending.add(line);
 		}
 	}
 
-	JFrame			frame;
-	AltosDevice		device;
-	AltosSerial		serial_line;
-	boolean			remote;
-	Thread			eeprom_thread;
-	AltosEepromMonitor	monitor;
+	void CaptureEeprom(AltosEepromChunk eechunk, int log_format) throws IOException {
+		boolean any_valid = false;
+		boolean got_flight = false;
 
-	void CaptureLog() throws IOException, InterruptedException, TimeoutException {
-		int			serial = 0;
-		int			block, state_block = 0;
-		int			addr;
-		int			flight = 0;
-		int			year = 0, month = 0, day = 0;
-		int			state = 0;
-		boolean			done = false;
-		boolean			want_file = false;
-		boolean			any_valid;
-		FileWriter		eeprom_file = null;
-		AltosFile		eeprom_name;
-		LinkedList<String>	eeprom_pending = new LinkedList<String>();
-
-		serial_line.printf("\nc s\nv\n");
-
-		/* Pull the serial number out of the version information */
-
-		for (;;) {
-			String	line = serial_line.get_reply(5000);
-
-			if (line == null)
-				throw new TimeoutException();
-			if (line.startsWith("serial-number")) {
-				try {
-					serial = Integer.parseInt(line.substring(13).trim());
-				} catch (NumberFormatException ne) {
-					serial = 0;
-				}
+		int record_length = 8;
+
+		state.set_serial(flights.config_data.serial);
+		monitor.set_serial(flights.config_data.serial);
+
+		for (int i = 0; i < AltosEepromChunk.chunk_size && !done; i += record_length) {
+			AltosEeprom r = eechunk.eeprom(i, log_format, state);
+
+			if (r == null)
+				continue;
+
+			record_length = r.record_length();
+
+			r.update_state(state);
+
+			if (!got_flight && state.flight != AltosLib.MISSING)
+				monitor.set_flight(state.flight);
+
+			/* Monitor state transitions to update display */
+			if (state.state != AltosLib.ao_flight_invalid &&
+			    state.state <= AltosLib.ao_flight_landed)
+			{
+				if (state.state > Altos.ao_flight_pad)
+					want_file = true;
+				if (state.state == AltosLib.ao_flight_landed)
+					done = true;
 			}
 
-			eeprom_pending.add(String.format("%s\n", line));
+			if (state.gps != null)
+				want_file = true;
 
-			/* signals the end of the version info */
-			if (line.startsWith("software-version"))
-				break;
+			if (r.valid) {
+				any_valid = true;
+				LogEeprom(r);
+			}
 		}
-		if (serial == 0)
+		if (!any_valid)
+			done = true;
+
+		CheckFile(false);
+	}
+	
+	void CaptureLog(AltosEepromLog log) throws IOException, InterruptedException, TimeoutException {
+		int			block, state_block = 0;
+		int			log_format = flights.config_data.log_format;
+
+		state = new AltosState();
+
+		done = false;
+		start = true;
+
+		if (flights.config_data.serial < 0)
 			throw new IOException("no serial number found");
 
-		monitor.set_serial(serial);
+		/* Reset per-capture variables */
+		want_file = false;
+		eeprom_file = null;
+		eeprom_pending = new LinkedList<String>();
+
+		/* Set serial number in the monitor dialog window */
 		/* Now scan the eeprom, reading blocks of data and converting to .eeprom file form */
 
-		state = 0; state_block = 0;
-		for (block = 0; !done && block < 511; block++) {
-			serial_line.printf("e %x\n", block);
-			any_valid = false;
-			monitor.set_value(state_names[state], state, block - state_block);
-			for (addr = 0; addr < 0x100;) {
-				String	line = serial_line.get_reply(5000);
-				if (line == null)
-					throw new TimeoutException();
-				int[] values = ParseHex(line);
-
-				if (values == null) {
-					System.out.printf("invalid line: %s\n", line);
-					continue;
-				} else if (values[0] != addr) {
-					System.out.printf("data address out of sync at 0x%x\n",
-							  block * 256 + values[0]);
-				} else if (checksum(values) != 0) {
-					System.out.printf("invalid checksum at 0x%x\n",
-							  block * 256 + values[0]);
-				} else {
-					any_valid = true;
-					int	cmd = values[1];
-					int	tick = values[3] + (values[4] << 8);
-					int	a = values[5] + (values[6] << 8);
-					int	b = values[7] + (values[8] << 8);
-
-					if (cmd == Altos.AO_LOG_FLIGHT) {
-						flight = b;
-						monitor.set_flight(flight);
-					}
+		state_block = log.start_block;
+		for (block = log.start_block; !done && block < log.end_block; block++) {
+			monitor.set_value(state.state_name(),
+					  state.state,
+					  block - state_block,
+					  block - log.start_block);
 
-					/* Monitor state transitions to update display */
-					if (cmd == Altos.AO_LOG_STATE && a <= Altos.ao_flight_landed) {
-						if (a > Altos.ao_flight_pad)
-							want_file = true;
-						if (a > state)
-							state_block = block;
-						state = a;
-					}
+			AltosEepromChunk	eechunk = new AltosEepromChunk(serial_line, block, block == log.start_block);
 
-					if (cmd == Altos.AO_LOG_GPS_DATE) {
-						year = 2000 + (a & 0xff);
-						month = (a >> 8) & 0xff;
-						day = (b & 0xff);
-						want_file = true;
-					}
+			/*
+			 * Guess what kind of data is there if the device
+			 * didn't tell us
+			 */
 
-					if (eeprom_file == null) {
-						if (serial != 0 && flight != 0 && want_file) {
-							if (year != 0 && month != 0 && day != 0)
-								eeprom_name = new AltosFile(year, month, day, serial, flight, "eeprom");
-							else
-								eeprom_name = new AltosFile(serial, flight, "eeprom");
-
-							monitor.set_file(eeprom_name.getName());
-							eeprom_file = new FileWriter(eeprom_name);
-							if (eeprom_file != null) {
-								FlushPending(eeprom_file, eeprom_pending);
-								eeprom_pending = null;
-							}
-						}
-					}
-
-					String log_line = String.format("%c %4x %4x %4x\n",
-									cmd, tick, a, b);
-					if (eeprom_file != null)
-						eeprom_file.write(log_line);
+			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
-						eeprom_pending.add(log_line);
-
-					if (cmd == Altos.AO_LOG_STATE && a == Altos.ao_flight_landed) {
-						done = true;
-					}
+						log_format = Altos.AO_LOG_FORMAT_TINY;
 				}
-				addr += 8;
-			}
-			if (!any_valid)
-				done = true;
-		}
-		if (eeprom_file == null) {
-			eeprom_name = new AltosFile(serial,flight,"eeprom");
-			eeprom_file = new FileWriter(eeprom_name);
-			if (eeprom_file != null) {
-				FlushPending(eeprom_file, eeprom_pending);
 			}
+
+			CaptureEeprom (eechunk, log_format);
 		}
+		CheckFile(true);
 		if (eeprom_file != null) {
 			eeprom_file.flush();
 			eeprom_file.close();
 		}
 	}
 
-	public void run () {
-		if (remote) {
-			serial_line.set_radio();
-			serial_line.printf("p\nE 0\n");
-			serial_line.flush_input();
-		}
+	private void show_message_internal(String message, String title, int message_type) {
+		JOptionPane.showMessageDialog(frame,
+					      message,
+					      title,
+					      message_type);
+	}
 
-		monitor = new AltosEepromMonitor(frame, Altos.ao_flight_boost, Altos.ao_flight_landed);
-		monitor.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent e) {
-					eeprom_thread.interrupt();
+	private void show_message(String in_message, String in_title, int in_message_type) {
+		final String message = in_message;
+		final String title = in_title;
+		final int message_type = in_message_type;
+		Runnable r = new Runnable() {
+				public void run() {
+					try {
+						show_message_internal(message, title, message_type);
+					} catch (Exception ex) {
+					}
 				}
-			});
+			};
+		SwingUtilities.invokeLater(r);
+	}
+
+	public void run () {
 		try {
-			CaptureLog();
+			boolean	failed = false;
+			if (remote)
+				serial_line.start_remote();
+
+			for (AltosEepromLog log : flights) {
+				parse_exception = null;
+				if (log.selected) {
+					monitor.reset();
+					CaptureLog(log);
+				}
+				if (parse_exception != null) {
+					failed = true;
+					show_message(String.format("Flight %d download error\n%s\nValid log data saved",
+								   log.flight,
+								   parse_exception.getMessage()),
+						     serial_line.device.toShortString(),
+						     JOptionPane.WARNING_MESSAGE);
+				}
+			}
+			success = !failed;
 		} catch (IOException ee) {
-			JOptionPane.showMessageDialog(frame,
-						      device.toShortString(),
-						      ee.getLocalizedMessage(),
-						      JOptionPane.ERROR_MESSAGE);
+			show_message(ee.getLocalizedMessage(),
+				     serial_line.device.toShortString(),
+				     JOptionPane.ERROR_MESSAGE);
 		} catch (InterruptedException ie) {
+			show_message(String.format("Connection to \"%s\" interrupted",
+						   serial_line.device.toShortString()),
+				     "Connection Interrupted",
+				     JOptionPane.ERROR_MESSAGE);
 		} catch (TimeoutException te) {
-			JOptionPane.showMessageDialog(frame,
-						      String.format("Connection to \"%s\" failed",
-								    device.toShortString()),
-						      "Connection Failed",
-						      JOptionPane.ERROR_MESSAGE);
+			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.printf("~");
 		monitor.done();
-		serial_line.flush_output();
-		serial_line.close();
+		if (listener != null) {
+			Runnable r = new Runnable() {
+					public void run() {
+						try {
+							listener.actionPerformed(new ActionEvent(this,
+												 success ? 1 : 0,
+												 "download"));
+						} catch (Exception ex) {
+						}
+					}
+				};
+			SwingUtilities.invokeLater(r);
+		}
 	}
 
-	public AltosEepromDownload(JFrame given_frame) {
+	public void start() {
+		eeprom_thread = new Thread(this);
+		eeprom_thread.start();
+	}
+
+	public void addActionListener(ActionListener l) {
+		listener = l;
+	}
+
+	public AltosEepromDownload(JFrame given_frame,
+				   AltosSerial given_serial_line,
+				   boolean given_remote,
+				   AltosEepromList given_flights) {
+
 		frame = given_frame;
-		device = AltosDeviceDialog.show(frame, AltosDevice.product_any);
-
-		remote = false;
-
-		if (device != null) {
-			try {
-				serial_line = new AltosSerial(device);
-				if (!device.matchProduct(AltosDevice.product_telemetrum))
-					remote = true;
-				eeprom_thread = new Thread(this);
-				eeprom_thread.start();
-			} catch (FileNotFoundException ee) {
-				JOptionPane.showMessageDialog(frame,
-							      String.format("Cannot open device \"%s\"",
-									    device.toShortString()),
-							      "Cannot open target device",
-							      JOptionPane.ERROR_MESSAGE);
-			} catch (AltosSerialInUseException si) {
-				JOptionPane.showMessageDialog(frame,
-							      String.format("Device \"%s\" already in use",
-									    device.toShortString()),
-							      "Device in use",
-							      JOptionPane.ERROR_MESSAGE);
-			} catch (IOException ee) {
-				JOptionPane.showMessageDialog(frame,
-							      device.toShortString(),
-							      ee.getLocalizedMessage(),
-							      JOptionPane.ERROR_MESSAGE);
-			}
-		}
+		serial_line = given_serial_line;
+		serial_line.set_frame(frame);
+		remote = given_remote;
+		flights = given_flights;
+		success = false;
+
+		monitor = new AltosEepromMonitor(frame, Altos.ao_flight_boost, Altos.ao_flight_landed);
+		monitor.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					if (eeprom_thread != null)
+						eeprom_thread.interrupt();
+				}
+			});
 	}
 }