projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set telegps USB id to 0025
[fw/altos]
/
altosui
/
AltosLanded.java
diff --git
a/altosui/AltosLanded.java
b/altosui/AltosLanded.java
index 57c2d476989e9b5b50d1ff2701ea85d59a2d9ca1..e13229a898150dd3fcca91fded2ab52316af6593 100644
(file)
--- a/
altosui/AltosLanded.java
+++ b/
altosui/AltosLanded.java
@@
-21,7
+21,7
@@
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import java.io.*;
import java.awt.event.*;
import javax.swing.*;
import java.io.*;
-import org.altusmetrum.
AltosLib
.*;
+import org.altusmetrum.
altoslib_1
.*;
public class AltosLanded extends JComponent implements AltosFlightDisplay, ActionListener {
GridBagLayout layout;
public class AltosLanded extends JComponent implements AltosFlightDisplay, ActionListener {
GridBagLayout layout;
@@
-173,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");
@@
-250,11
+250,14
@@
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);
}
try {
} else {
throw new FileNotFoundException(filename);
}
try {
- new AltosGraphUI(records, file
name
);
+ new AltosGraphUI(records, file);
} catch (InterruptedException ie) {
} catch (IOException ie) {
}
} catch (InterruptedException ie) {
} catch (IOException ie) {
}