Merge remote-tracking branch 'mjb/altosui_mjb'

[fw/altos] / altosui / AltosEepromList.java

diff --git a/altosui/AltosEepromList.java b/altosui/AltosEepromList.java
index a932dd129760ed1b0ca34e2df7f22c8751ce5357..f9bd2748a79ca539ac5cc248a2bd486f663dcefc 100644 (file)
--- a/altosui/AltosEepromList.java
+++ b/altosui/AltosEepromList.java
@@ -17,18 +17,11 @@
 
 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.*;
 
 /*
  * Temporary structure to hold the list of stored flights;
@@ -62,12 +55,12 @@ public class AltosEepromList extends ArrayList<AltosEepromLog> {
                        if (remote)
                                serial_line.start_remote();
                        config_data = new AltosConfigData (serial_line);
-                       if (config_data.serial == 0)
-                               throw new IOException("no serial number found");
+//                     if (config_data.serial == 0)
+//                             throw new IOException("no serial number found");
 
                        ArrayList<AltosEepromFlight> flights = new ArrayList<AltosEepromFlight>();
 
-                       if (config_data.flight_log_max != 0) {
+                       if (config_data.flight_log_max != 0 || config_data.log_format != 0) {
 
                                /* Devices with newer firmware will support the 'l'
                                 * command which will list the region of storage
@@ -83,7 +76,6 @@ public class AltosEepromList extends ArrayList<AltosEepromLog> {
                                        if (line.contains("Syntax"))
                                                continue;
                                        String[] tokens = line.split("\\s+");
-                                       System.out.printf("got line %s (%d tokens)\n", line, tokens.length);
                                        if (tokens.length < 6)
                                                break;
 
@@ -95,7 +87,6 @@ public class AltosEepromList extends ArrayList<AltosEepromLog> {
                                                        start = AltosParse.parse_hex(tokens[3]);
                                                if (tokens[4].equals("end"))
                                                        end = AltosParse.parse_hex(tokens[5]);
-                                               System.out.printf("parsed flight %d %x %x\n", flight, start, end);
                                                if (flight > 0 && start >= 0 && end > 0)
                                                        flights.add(new AltosEepromFlight(flight, start, end));
                                        } catch (ParseException pe) { System.out.printf("Parse error %s\n", pe.toString()); }
@@ -115,18 +106,13 @@ public class AltosEepromList extends ArrayList<AltosEepromLog> {
                         * firmware, this will also extract the flight number.
                         */
                        for (AltosEepromFlight flight : flights) {
-                               System.out.printf("Scanning flight %d %x %x\n", flight.flight, flight.start, flight.end);
-                               add(new AltosEepromLog(serial_line, config_data.serial,
-                                                      flight.start, flight.end));
+                               add(new AltosEepromLog(config_data, serial_line,
+                                                      flight.flight, flight.start, flight.end));
                        }
                } finally {
                        if (remote)
                                serial_line.stop_remote();
                        serial_line.flush_output();
                }
-               for (int i = 0; i < size(); i++) {
-                       AltosEepromLog  l = get(i);
-                       System.out.printf("Found flight %d at %x - %x\n", l.flight, l.start_block, l.end_block);
-               }
        }
 }
\ No newline at end of file