projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Define 3.8 as a good battery and 3.5 as a good igniter
[fw/altos]
/
altosui
/
AltosLanded.java
diff --git
a/altosui/AltosLanded.java
b/altosui/AltosLanded.java
index 630527a04d601f66a31ba81913281aa0f5b3107e..cc2053e0ca5fe7896557241f31e9dc0bb2854424 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_
1
.*;
+import org.altusmetrum.altoslib_
2
.*;
public class AltosLanded extends JComponent implements AltosFlightDisplay, ActionListener {
GridBagLayout layout;
public class AltosLanded extends JComponent implements AltosFlightDisplay, ActionListener {
GridBagLayout layout;
@@
-104,7
+104,7
@@
public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
class Lat extends LandedValue {
void show (AltosState state, AltosListenerState listener_state) {
show();
class Lat extends LandedValue {
void show (AltosState state, AltosListenerState listener_state) {
show();
- if (state.gps != null && state.gps.connected && state.gps.lat != Altos
Record
.MISSING)
+ if (state.gps != null && state.gps.connected && state.gps.lat != Altos
Lib
.MISSING)
show(pos(state.gps.lat,"N", "S"));
else
show("???");
show(pos(state.gps.lat,"N", "S"));
else
show("???");
@@
-119,7
+119,7
@@
public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
class Lon extends LandedValue {
void show (AltosState state, AltosListenerState listener_state) {
show();
class Lon extends LandedValue {
void show (AltosState state, AltosListenerState listener_state) {
show();
- if (state.gps != null && state.gps.connected && state.gps.lon != Altos
Record
.MISSING)
+ if (state.gps != null && state.gps.connected && state.gps.lon != Altos
Lib
.MISSING)
show(pos(state.gps.lon,"E", "W"));
else
show("???");
show(pos(state.gps.lon,"E", "W"));
else
show("???");
@@
-250,7
+250,7
@@
public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
states = new AltosEepromFile(in);
} else if (filename.endsWith("telem")) {
FileInputStream in = new FileInputStream(file);
states = new AltosEepromFile(in);
} else if (filename.endsWith("telem")) {
FileInputStream in = new FileInputStream(file);
- states = n
ull; // new AltosTelemetryIterab
le(in);
+ states = n
ew AltosTelemetryFi
le(in);
} else {
throw new FileNotFoundException(filename);
}
} else {
throw new FileNotFoundException(filename);
}