diff options
| author | Keith Packard <keithp@keithp.com> | 2012-07-03 00:29:43 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-03 00:29:43 -0700 |
| commit | ea957f9e6144f8411ac84ee2905700f55f5a6e8a (patch) | |
| tree | f2fac4d8d9a941fdbd765835bd2f0836621f3890 | |
| parent | 933fc7e4c2f617e49e1cfdf45b83695290b51456 (diff) | |
altosui: Fix flight data download for TM. Look for MM flights when graphing
A couple of minor fixes, the first to not force the log format so that
TM/Tm data will be downloaded correctly and the second to expand the
set of files to include '.mega' files when plotting data.
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | altosui/AltosDataChooser.java | 2 | ||||
| -rw-r--r-- | altosui/AltosEepromDownload.java | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/altosui/AltosDataChooser.java b/altosui/AltosDataChooser.java index 0d629b3c..4bd51c39 100644 --- a/altosui/AltosDataChooser.java +++ b/altosui/AltosDataChooser.java @@ -77,7 +77,7 @@ public class AltosDataChooser extends JFileChooser { frame = in_frame; setDialogTitle("Select Flight Record File"); setFileFilter(new FileNameExtensionFilter("Flight data file", - "telem", "eeprom")); + "telem", "eeprom", "mega")); setCurrentDirectory(AltosUIPreferences.logdir()); } } diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java index d1e5fdf0..4a35c2f1 100644 --- a/altosui/AltosEepromDownload.java +++ b/altosui/AltosEepromDownload.java @@ -319,11 +319,9 @@ public class AltosEepromDownload implements Runnable { done = false; start = true; -// if (flights.config_data.serial == 0) -// throw new IOException("no serial number found"); + if (flights.config_data.serial == 0) + throw new IOException("no serial number found"); - log_format = 5; - System.out.printf ("log format: %d\n", log_format); /* Reset per-capture variables */ flight = 0; year = 0; |