projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Document what HAS_BOOT_RADIO does in the m25 driver
[fw/altos]
/
altosui
/
AltosUI.java
diff --git
a/altosui/AltosUI.java
b/altosui/AltosUI.java
index c1a66b835692c695f232f401a1030002602ee583..dcc0de600817aab22666705581ffe42afa8de996 100644
(file)
--- a/
altosui/AltosUI.java
+++ b/
altosui/AltosUI.java
@@
-20,17
+20,10
@@
package altosui;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
import java.io.*;
import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
import java.util.concurrent.*;
import org.altusmetrum.AltosLib.*;
import java.util.concurrent.*;
import org.altusmetrum.AltosLib.*;
-import libaltosJNI.*;
-
public class AltosUI extends AltosFrame {
public AltosVoice voice = new AltosVoice();
public class AltosUI extends AltosFrame {
public AltosVoice voice = new AltosVoice();
@@
-94,7
+87,7
@@
public class AltosUI extends AltosFrame {
c.weighty = 1;
b = new JButton(label);
c.weighty = 1;
b = new JButton(label);
- Dimension ps = b.getPreferredSize();
+
//
Dimension ps = b.getPreferredSize();
gridbag.setConstraints(b, c);
add(b, c);
gridbag.setConstraints(b, c);
add(b, c);
@@
-448,9
+441,11
@@
public class AltosUI extends AltosFrame {
return null;
}
AltosRecordIterable recs;
return null;
}
AltosRecordIterable recs;
- AltosReplayReader reader;
+
//
AltosReplayReader reader;
if (file.getName().endsWith("eeprom")) {
recs = new AltosEepromIterable(in);
if (file.getName().endsWith("eeprom")) {
recs = new AltosEepromIterable(in);
+ } else if (file.getName().endsWith("mega")) {
+ recs = new AltosEepromMegaIterable(in);
} else {
recs = new AltosTelemetryIterable(in);
}
} else {
recs = new AltosTelemetryIterable(in);
}