X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMicroDownload.java;h=e656dc6fb214292000aaca59b43d1c6f3fffc98f;hp=cd109b796bd71b7be99bf3d8c3b88befb6262fe3;hb=8c92656576aff3ceab5bead3c835d96c36098fe7;hpb=9e0bda088c097ac6bcc677d7b6d00683e73a68fb

diff --git a/micropeak/MicroDownload.java b/micropeak/MicroDownload.java
index cd109b79..e656dc6f 100644
--- a/micropeak/MicroDownload.java
+++ b/micropeak/MicroDownload.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,10 +24,10 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
-import org.altusmetrum.altoslib_3.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_13.*;
+import org.altusmetrum.altosuilib_13.*;
 
-public class MicroDownload extends AltosUIDialog implements Runnable, ActionListener, MicroSerialLog {
+public class MicroDownload extends AltosUIDialog implements Runnable, ActionListener, MicroSerialLog, WindowListener {
 	MicroPeak	owner;
 	Container	pane;
 	AltosDevice	device;
@@ -37,25 +38,46 @@ public class MicroDownload extends AltosUIDialog implements Runnable, ActionList
 	Runnable	log_run;
 	JTextArea	serial_log;
 	JLabel		status_value;
+	int		log_column;
+
+	public void windowActivated(WindowEvent e) {
+	}
+
+	public void windowClosed(WindowEvent e) {
+		setVisible(false);
+		dispose();
+	}
+
+	public void windowClosing(WindowEvent e) {
+	}
+
+	public void windowDeactivated(WindowEvent e) {
+	}
+
+	public void windowDeiconified(WindowEvent e) {
+	}
+
+	public void windowIconified(WindowEvent e) {
+	}
+
+	public void windowOpened(WindowEvent e) {
+	}
 
 	private void done_internal() {
-		if (data != null) {
+		setVisible(false);
+		dispose();
+
+		if (data != null && data.crc_valid) {
 			status_value.setText("Received MicroPeak Data");
-			if (data.crc_valid) {
-				owner = owner.SetData(data);
-				MicroSave save = new MicroSave(owner, data);
-				if (save.runDialog())
-					owner.SetName(data.name);
-			} else {
-				JOptionPane.showMessageDialog(owner,
-							      "Flight data corrupted",
-							      "Download Failed",
-							      JOptionPane.ERROR_MESSAGE);
-			}
-			setVisible(false);
-			dispose();
+			owner = owner.SetData(data);
+			MicroSave save = new MicroSave(owner, data);
+			if (save.runDialog())
+				owner.SetName(data.name);
 		} else {
-			status_value.setText("Download Failed");
+			JOptionPane.showMessageDialog(owner,
+						      "Download Failed",
+						      "Flight data corrupted",
+						      JOptionPane.ERROR_MESSAGE);
 		}
 	}
 
@@ -71,9 +93,26 @@ public class MicroDownload extends AltosUIDialog implements Runnable, ActionList
 			}
 			if (c == '\r')
 				continue;
-			byte[] bytes = new byte[1];
-			bytes[0] = (byte) c;
-			serial_log.append(new String(bytes, AltosLib.unicode_set));
+			if (c == '\0')
+				continue;
+			String s;
+			if (c == '\n') {
+				s = "\n";
+				log_column = 0;
+			} else if (' ' <= c && c <= '~') {
+				byte[] bytes = new byte[1];
+				bytes[0] = (byte) c;
+				s = new String(bytes, AltosLib.unicode_set);
+				log_column += 1;
+			} else {
+				s = String.format("\\0x%02x", c & 0xff);
+				log_column += 5;
+			}
+			serial_log.append(s);
+			if (log_column > 40) {
+				serial_log.append("\n");
+				log_column = 0;
+			}
 		}
 	}
 
@@ -105,12 +144,20 @@ public class MicroDownload extends AltosUIDialog implements Runnable, ActionList
 
 	public void run() {
 		try {
-			data = new MicroData(serial, device.toShortString());
-			serial.close();
+			for (;;) {
+				try {
+					data = new MicroData(serial, device.toShortString());
+					if (data != null && data.crc_valid)
+						break;
+				} catch (MicroData.NonHexcharException nhe) {
+				}
+			}
 		} catch (FileNotFoundException fe) {
 		} catch (IOException ioe) {
 		} catch (InterruptedException ie) {
+		} catch (MicroData.FileEndedException fee) {
 		}
+		serial.close();
 		done();
 	}
 
@@ -172,12 +219,12 @@ public class MicroDownload extends AltosUIDialog implements Runnable, ActionList
 		c.gridx = 0; c.gridy = y;
 		c.gridwidth = GridBagConstraints.REMAINDER;
 		c.fill = GridBagConstraints.HORIZONTAL;
-		c.weightx = 1;
+		c.weightx = 0;
 		c.anchor = GridBagConstraints.LINE_START;
 		c.insets = ir;
 		JLabel help_text = new JLabel(
 			"<html><i>Turn on the MicroPeak and place the LED inside the<br>" +
-			"opening in the top of the MicroPeak USB adapter.<br>" +
+			"opening in the top of the MicroPeak USB adapter.<br> " +
 			"Verify that the blue LED in the side of the USB adapter<br>" +
 			"is blinking along with the orange LED on the MicroPeak.</i></html>");
 //		help_text.setEditable(false);
@@ -205,8 +252,9 @@ public class MicroDownload extends AltosUIDialog implements Runnable, ActionList
 		c = new GridBagConstraints();
 		c.gridx = 0; c.gridy = y;
 		c.gridwidth = GridBagConstraints.REMAINDER;
-		c.fill = GridBagConstraints.HORIZONTAL;
+		c.fill = GridBagConstraints.BOTH;
 		c.weightx = 1;
+		c.weighty = 1;
 		c.anchor = GridBagConstraints.LINE_START;
 		c.insets = ir;