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
/
AltosLanded.java
diff --git
a/altosui/AltosLanded.java
b/altosui/AltosLanded.java
index 68efae8d85ba6e6c1342d404983e9ea057440f3a..5e073f7dce7184ff31ce9a7255c569f75c32e35e 100644
(file)
--- a/
altosui/AltosLanded.java
+++ b/
altosui/AltosLanded.java
@@
-20,13
+20,7
@@
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.LinkedBlockingQueue;
import org.altusmetrum.AltosLib.*;
public class AltosLanded extends JComponent implements AltosFlightDisplay, ActionListener {
import org.altusmetrum.AltosLib.*;
public class AltosLanded extends JComponent implements AltosFlightDisplay, ActionListener {
@@
-179,7
+173,7
@@
public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
class Speed extends LandedValue {
void show (AltosState state, int crc_errors) {
class Speed extends LandedValue {
void show (AltosState state, int crc_errors) {
- show(AltosConvert.speed, state.max_speed);
+ show(AltosConvert.speed, state.max_speed
()
);
}
public Speed (GridBagLayout layout, int y) {
super (layout, y, "Maximum Speed");
}
public Speed (GridBagLayout layout, int y) {
super (layout, y, "Maximum Speed");
@@
-256,6
+250,9
@@
public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
} else if (filename.endsWith("telem")) {
FileInputStream in = new FileInputStream(file);
records = new AltosTelemetryIterable(in);
} else if (filename.endsWith("telem")) {
FileInputStream in = new FileInputStream(file);
records = new AltosTelemetryIterable(in);
+ } else if (filename.endsWith("mega")) {
+ FileInputStream in = new FileInputStream(file);
+ records = new AltosEepromMegaIterable(in);
} else {
throw new FileNotFoundException(filename);
}
} else {
throw new FileNotFoundException(filename);
}