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>

diff --git a/altosui/AltosDataChooser.java b/altosui/AltosDataChooser.java
index 0d629b3c2cca994443e74507bcb413cb58b03b2a..4bd51c3938e61635bfb6ef49c6466c50304e7b8a 100644 (file)
--- 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 d1e5fdf0484cd2d51c3a70ef10f9e56761e81a46..4a35c2f1c299b8bbb9121d2565fc7284a5e6208c 100644 (file)
--- 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;