altosui: Compute flight state from eeprom data

[fw/altos] / ao-tools / altosui / AltosEepromDownload.java

diff --git a/ao-tools/altosui/AltosEepromDownload.java b/ao-tools/altosui/AltosEepromDownload.java
index 756b82d188d552308a857b274d71413b0fd319c0..f2fcd09e687c3d3fb9e85b4eabb7e920b021b87c 100644 (file)
--- a/ao-tools/altosui/AltosEepromDownload.java
+++ b/ao-tools/altosui/AltosEepromDownload.java
@@ -31,6 +31,7 @@ import java.util.concurrent.LinkedBlockingQueue;
 import altosui.Altos;
 import altosui.AltosSerial;
 import altosui.AltosSerialMonitor;
+import altosui.AltosRecord;
 import altosui.AltosTelemetry;
 import altosui.AltosState;
 import altosui.AltosDeviceDialog;
@@ -103,7 +104,7 @@ public class AltosEepromDownload implements Runnable {
                AltosFile               eeprom_name;
                LinkedList<String>      eeprom_pending = new LinkedList<String>();
 
-               serial_line.printf("v\n");
+               serial_line.printf("\nc s\nv\n");
 
                /* Pull the serial number out of the version information */
 
@@ -113,12 +114,13 @@ public class AltosEepromDownload implements Runnable {
                        if (line.startsWith("serial-number")) {
                                try {
                                        serial = Integer.parseInt(line.substring(13).trim());
-                                       eeprom_pending.add(String.format("%s\n", line));
                                } catch (NumberFormatException ne) {
                                        serial = 0;
                                }
                        }
 
+                       eeprom_pending.add(String.format("%s\n", line));
+
                        /* signals the end of the version info */
                        if (line.startsWith("software-version"))
                                break;