Changed package name from altosui to AltosUI

[fw/altos] / altosui / AltosEepromList.java

diff --git a/altosui/AltosEepromList.java b/altosui/AltosEepromList.java
index 575c0bc2c3f044977468eab46b579166de1f006c..2a88134c7304fb8b3e5d81d07b20f0f54f686d12 100644 (file)
--- a/altosui/AltosEepromList.java
+++ b/altosui/AltosEepromList.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package AltosUI;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -27,6 +27,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
 
 import libaltosJNI.*;
 
@@ -62,12 +63,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
@@ -113,8 +114,8 @@ public class AltosEepromList extends ArrayList<AltosEepromLog> {
                         * firmware, this will also extract the flight number.
                         */
                        for (AltosEepromFlight flight : flights) {
-                               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)