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

diff --git a/micropeak/MicroDownload.java b/micropeak/MicroDownload.java
index 28a7550d..cd109b79 100644
--- a/micropeak/MicroDownload.java
+++ b/micropeak/MicroDownload.java
@@ -23,20 +23,24 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
-import org.altusmetrum.AltosLib.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altosuilib_1.*;
 
-public class MicroDownload extends AltosUIDialog implements Runnable, ActionListener {
+public class MicroDownload extends AltosUIDialog implements Runnable, ActionListener, MicroSerialLog {
 	MicroPeak	owner;
 	Container	pane;
 	AltosDevice	device;
 	JButton		cancel;
 	MicroData	data;
 	MicroSerial	serial;
+	LinkedList<Integer> log_queue = new LinkedList<Integer>();
+	Runnable	log_run;
+	JTextArea	serial_log;
+	JLabel		status_value;
 
 	private void done_internal() {
-		setVisible(false);
 		if (data != null) {
+			status_value.setText("Received MicroPeak Data");
 			if (data.crc_valid) {
 				owner = owner.SetData(data);
 				MicroSave save = new MicroSave(owner, data);
@@ -48,8 +52,43 @@ public class MicroDownload extends AltosUIDialog implements Runnable, ActionList
 							      "Download Failed",
 							      JOptionPane.ERROR_MESSAGE);
 			}
+			setVisible(false);
+			dispose();
+		} else {
+			status_value.setText("Download Failed");
+		}
+	}
+
+	public void drain_queue() {
+		for (;;) {
+			int	c;
+			synchronized(this) {
+				if (log_queue.isEmpty()) {
+					log_run = null;
+					break;
+				}
+				c = log_queue.remove();
+			}
+			if (c == '\r')
+				continue;
+			byte[] bytes = new byte[1];
+			bytes[0] = (byte) c;
+			serial_log.append(new String(bytes, AltosLib.unicode_set));
+		}
+	}
+
+	public void log_char(int c) {
+		synchronized(this) {
+			log_queue.add(c);
+			if (log_run == null) {
+				log_run = new Runnable() {
+						public void run() {
+							drain_queue();
+						}
+					};
+				SwingUtilities.invokeLater(log_run);
+			}
 		}
-		dispose();
 	}
 
 	public void done() {
@@ -80,6 +119,7 @@ public class MicroDownload extends AltosUIDialog implements Runnable, ActionList
 	public void start() {
 		try {
 			serial = new MicroSerial(device);
+			serial.set_log(this);
 		} catch (FileNotFoundException fe) {
 			return;
 		}
@@ -92,11 +132,14 @@ public class MicroDownload extends AltosUIDialog implements Runnable, ActionList
 			serial.close();
 			serial_thread.interrupt();
 		}
+		setVisible(false);
 	}
 
 	public MicroDownload(MicroPeak owner, AltosDevice device) {
 		super (owner, "Download MicroPeak Data", false);
 
+		int y = 0;
+
 		GridBagConstraints c;
 		Insets il = new Insets(4,4,4,4);
 		Insets ir = new Insets(4,4,4,4);
@@ -108,7 +151,7 @@ public class MicroDownload extends AltosUIDialog implements Runnable, ActionList
 		pane.setLayout(new GridBagLayout());
 
 		c = new GridBagConstraints();
-		c.gridx = 0; c.gridy = 0;
+		c.gridx = 0; c.gridy = y;
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.LINE_START;
 		c.insets = il;
@@ -116,29 +159,76 @@ public class MicroDownload extends AltosUIDialog implements Runnable, ActionList
 		pane.add(device_label, c);
 
 		c = new GridBagConstraints();
-		c.gridx = 1; c.gridy = 0;
-		c.fill = GridBagConstraints.HORIZONTAL;
+		c.gridx = 1; c.gridy = y;
+		c.fill = GridBagConstraints.NONE;
 		c.weightx = 1;
 		c.anchor = GridBagConstraints.LINE_START;
 		c.insets = ir;
 		JLabel device_value = new JLabel(device.toString());
 		pane.add(device_value, c);
+		y++;
+
+		c = new GridBagConstraints();
+		c.gridx = 0; c.gridy = y;
+		c.gridwidth = GridBagConstraints.REMAINDER;
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.weightx = 1;
+		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>" +
+			"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);
+
+		pane.add(help_text, c);
+		y++;
+
+		c = new GridBagConstraints();
+		c.gridx = 0; c.gridy = y;
+		c.gridwidth = 2;
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.weightx = 1;
+		c.anchor = GridBagConstraints.LINE_START;
+		c.insets = ir;
+		status_value = new JLabel("Waiting for MicroPeak data...");
+		pane.add(status_value, c);
+		y++;
+
+		serial_log = new JTextArea(10, 20);
+		serial_log.setEditable(false);
+
+		JScrollPane serial_scroll = new JScrollPane(serial_log);
+		serial_scroll.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
+
+		c = new GridBagConstraints();
+		c.gridx = 0; c.gridy = y;
+		c.gridwidth = GridBagConstraints.REMAINDER;
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.weightx = 1;
+		c.anchor = GridBagConstraints.LINE_START;
+		c.insets = ir;
+
+		pane.add(serial_scroll, c);
+		y++;
 
 		cancel = new JButton("Cancel");
 		c = new GridBagConstraints();
 		c.fill = GridBagConstraints.NONE;
-		c.anchor = GridBagConstraints.CENTER;
-		c.gridx = 0; c.gridy = 1;
+		c.anchor = GridBagConstraints.EAST;
+		c.gridx = 0; c.gridy = y;
 		c.gridwidth = GridBagConstraints.REMAINDER;
 		Insets ic = new Insets(4,4,4,4);
 		c.insets = ic;
 		pane.add(cancel, c);
+		y++;
 
 		cancel.addActionListener(this);
 
 		pack();
 		setLocationRelativeTo(owner);
 		setVisible(true);
-		this.start();
+		start();
 	}
 }