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' into hacking-cc1120
[fw/altos]
/
altosui
/
AltosUI.java
diff --git
a/altosui/AltosUI.java
b/altosui/AltosUI.java
index e4af6b3b39d295674dd79b7605c3cee5f0330bd1..dcc0de600817aab22666705581ffe42afa8de996 100644
(file)
--- a/
altosui/AltosUI.java
+++ b/
altosui/AltosUI.java
@@
-87,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);
@@
-441,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);
}