From: Keith Packard <keithp@keithp.com>
Date: Tue, 3 Jul 2012 07:29:43 +0000 (-0700)
Subject: altosui: Fix flight data download for TM. Look for MM flights when graphing
X-Git-Tag: 1.1~123
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=ea957f9e6144f8411ac84ee2905700f55f5a6e8a

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 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;