diff options
| author | Keith Packard <keithp@keithp.com> | 2012-10-18 15:18:52 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-10-18 15:18:52 -0700 |
| commit | 5a55501660ebab3b858a48483c5df1cfb4e858e4 (patch) | |
| tree | 9b5d8305d9c65b10f82f6839bb1b5c169681ef00 /altosui | |
| parent | 0361235c9ef56738ba0e97be88a85afef0ce8268 (diff) | |
| parent | 440365bd17d804c2f574c35164612cf1682397d7 (diff) | |
Merge branch 'master' into mm-ms5611
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosui')
| -rw-r--r-- | altosui/AltosDescent.java | 5 | ||||
| -rw-r--r-- | altosui/AltosEepromDownload.java | 2 | ||||
| -rw-r--r-- | altosui/AltosFlightUI.java | 3 | ||||
| -rw-r--r-- | altosui/AltosUI.java | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java index e9ff590b..a71cdc10 100644 --- a/altosui/AltosDescent.java +++ b/altosui/AltosDescent.java @@ -309,7 +309,10 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay { class Distance extends DescentValue { void show(AltosState state, int crc_errors) { - show(AltosConvert.distance, state.from_pad.distance); + if (state.from_pad != null) + show(AltosConvert.distance, state.from_pad.distance); + else + show("???"); } public Distance (GridBagLayout layout, int x, int y) { diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java index a8cb24ff..a5e99749 100644 --- a/altosui/AltosEepromDownload.java +++ b/altosui/AltosEepromDownload.java @@ -314,7 +314,7 @@ public class AltosEepromDownload implements Runnable { done = false; start = true; - if (flights.config_data.serial == 0) + if (flights.config_data.serial < 0) throw new IOException("no serial number found"); /* Reset per-capture variables */ diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java index 533b1951..43df705e 100644 --- a/altosui/AltosFlightUI.java +++ b/altosui/AltosFlightUI.java @@ -138,7 +138,8 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt } } } catch (Exception e) { - System.out.print("Show exception" + e); + System.out.print("Show exception " + e + "\n"); + e.printStackTrace(); } } diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java index b5cbefe7..dcc0de60 100644 --- a/altosui/AltosUI.java +++ b/altosui/AltosUI.java @@ -444,6 +444,8 @@ public class AltosUI extends AltosFrame { //AltosReplayReader reader; if (file.getName().endsWith("eeprom")) { recs = new AltosEepromIterable(in); + } else if (file.getName().endsWith("mega")) { + recs = new AltosEepromMegaIterable(in); } else { recs = new AltosTelemetryIterable(in); } |