X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosEepromList.java;h=6a656215083796c2eaca6512a68c51b79626d06a;hb=50b343d389039eae082e82b8ac0b76ae3e2b3ad4;hp=575c0bc2c3f044977468eab46b579166de1f006c;hpb=dea80af81b388cc3d7073444919f4e98b12fa730;p=fw%2Faltos diff --git a/altosui/AltosEepromList.java b/altosui/AltosEepromList.java index 575c0bc2..6a656215 100644 --- a/altosui/AltosEepromList.java +++ b/altosui/AltosEepromList.java @@ -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 { 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 flights = new ArrayList(); - 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 { * 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)