projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
altosui
/
AltosEepromList.java
diff --git
a/altosui/AltosEepromList.java
b/altosui/AltosEepromList.java
index 185fec9118a146d228367b8ff813a3ac36383f16..f9bd2748a79ca539ac5cc248a2bd486f663dcefc 100644
(file)
--- a/
altosui/AltosEepromList.java
+++ b/
altosui/AltosEepromList.java
@@
-17,18
+17,11
@@
package altosui;
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.io.*;
import java.util.*;
import java.text.*;
-import java.util.prefs.*;
import java.util.concurrent.*;
import java.util.concurrent.*;
-
-import libaltosJNI.*;
+import org.altusmetrum.AltosLib.*;
/*
* Temporary structure to hold the list of stored flights;
/*
* 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 (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>();
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
/* Devices with newer firmware will support the 'l'
* command which will list the region of storage
@@
-113,7
+106,7
@@
public class AltosEepromList extends ArrayList<AltosEepromLog> {
* firmware, this will also extract the flight number.
*/
for (AltosEepromFlight flight : flights) {
* firmware, this will also extract the flight number.
*/
for (AltosEepromFlight flight : flights) {
- add(new AltosEepromLog(
serial_line, config_data.serial
,
+ add(new AltosEepromLog(
config_data, serial_line
,
flight.flight, flight.start, flight.end));
}
} finally {
flight.flight, flight.start, flight.end));
}
} finally {