src: Add easymini-v3.0

[fw/altos] / micropeak / MicroDownload.java

diff --git a/micropeak/MicroDownload.java b/micropeak/MicroDownload.java
index 1ede2d9a78989dd14f8599d098191807bdbe7026..4dcb7a360e928e2457b084bc0bc5d3d6d545c3cd 100644 (file)
--- a/micropeak/MicroDownload.java
+++ b/micropeak/MicroDownload.java
@@ -64,21 +64,27 @@ public class MicroDownload extends AltosUIDialog implements Runnable, ActionList
        }
 
        private void done_internal() {
-               setVisible(false);
-               dispose();
-
                if (data != null && data.crc_valid) {
-                       status_value.setText("Received MicroPeak Data");
-                       owner = owner.SetData(data);
-                       MicroSave save = new MicroSave(owner, data);
-                       if (save.runDialog())
-                               owner.SetName(data.name);
+                       if (data.nsamples == 0) {
+                               JOptionPane.showMessageDialog(owner,
+                                                             "No Flight Data Present",
+                                                             "Empty Log",
+                                                             JOptionPane.WARNING_MESSAGE);
+                       } else {
+                               status_value.setText("Received MicroPeak Data");
+                               owner = owner.SetData(data);
+                               MicroSave save = new MicroSave(owner, data);
+                               if (save.runDialog())
+                                       owner.SetName(data.name);
+                       }
                } else {
                        JOptionPane.showMessageDialog(owner,
                                                      "Download Failed",
                                                      "Flight data corrupted",
                                                      JOptionPane.ERROR_MESSAGE);
                }
+               setVisible(false);
+               dispose();
        }
 
        public void drain_queue() {
@@ -152,6 +158,7 @@ public class MicroDownload extends AltosUIDialog implements Runnable, ActionList
                                } catch (MicroData.NonHexcharException nhe) {
                                }
                        }
+                       write_thread.join();
                } catch (FileNotFoundException fe) {
                } catch (IOException ioe) {
                } catch (InterruptedException ie) {
@@ -162,16 +169,34 @@ public class MicroDownload extends AltosUIDialog implements Runnable, ActionList
        }
 
        Thread  serial_thread;
+       Thread  write_thread;
+
+       public class SerialWriter implements Runnable {
+               MicroSerial serial;
+
+               public void run () {
+                       try {
+                               Thread.sleep(100);
+                               serial.write('l');
+                               serial.write('\n');
+                               serial.flush();
+                       } catch (InterruptedException ie) {
+                       }
+               }
 
-       public void start() {
-               try {
-                       serial = new MicroSerial(device);
-                       serial.set_log(this);
-               } catch (FileNotFoundException fe) {
-                       return;
+               public SerialWriter(MicroSerial serial) {
+                       this.serial = serial;
                }
+       }
+
+       public void start() {
+               serial.set_log(this);
                serial_thread = new Thread(this);
                serial_thread.start();
+
+               SerialWriter writer = new SerialWriter(serial);
+               write_thread = new Thread(writer);
+               write_thread.start();
        }
 
        public void actionPerformed(ActionEvent ae) {
@@ -182,7 +207,7 @@ public class MicroDownload extends AltosUIDialog implements Runnable, ActionList
                setVisible(false);
        }
 
-       public MicroDownload(MicroPeak owner, AltosDevice device) {
+       public MicroDownload(MicroPeak owner, AltosDevice device, MicroSerial serial) {
                super (owner, "Download MicroPeak Data", false);
 
                int y = 0;
@@ -193,8 +218,9 @@ public class MicroDownload extends AltosUIDialog implements Runnable, ActionList
 
                this.owner = owner;
                this.device = device;
+               this.serial = serial;
 
-               pane = getContentPane();
+               pane = getScrollablePane();
                pane.setLayout(new GridBagLayout());
 
                c = new GridBagConstraints();