From: Keith Packard <keithp@keithp.com>
Date: Sat, 14 Jun 2014 22:20:07 +0000 (-0700)
Subject: alotsuilib: Remove old "mega" and "mini" file extensions from data chooser
X-Git-Tag: 1.4~27
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=1fc3032d688cbb7c09c1dffde30cc815f3594e29;hp=c11b2f5caa3fbe2bc977e716ec1c3ccee9e75884

alotsuilib: Remove old "mega" and "mini" file extensions from data chooser

We never shipped AltosUI which stored mega/mini files in different extensions

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosuilib/AltosDataChooser.java b/altosuilib/AltosDataChooser.java
index 14d28115..59891c4a 100644
--- a/altosuilib/AltosDataChooser.java
+++ b/altosuilib/AltosDataChooser.java
@@ -67,16 +67,12 @@ public class AltosDataChooser extends JFileChooser {
 	public AltosDataChooser(JFrame in_frame) {
 		frame = in_frame;
 		setDialogTitle("Select Flight Record File");
-		setFileFilter(new FileNameExtensionFilter("TeleMetrum eeprom file",
+		setFileFilter(new FileNameExtensionFilter("On-board Log file",
 							  "eeprom"));
 		setFileFilter(new FileNameExtensionFilter("Telemetry file",
 							  "telem"));
-		setFileFilter(new FileNameExtensionFilter("TeleMega eeprom file",
-							  "mega"));
-		setFileFilter(new FileNameExtensionFilter("EasyMini eeprom file",
-							  "mini"));
 		setFileFilter(new FileNameExtensionFilter("Flight data file",
-							  "telem", "eeprom", "mega", "mini"));
+							  "telem", "eeprom"));
 		setCurrentDirectory(AltosUIPreferences.logdir());
 	}
 }
diff --git a/telegps/TeleGPSDisplayThread.java b/telegps/TeleGPSDisplayThread.java
index 9de33098..a3d4ea07 100644
--- a/telegps/TeleGPSDisplayThread.java
+++ b/telegps/TeleGPSDisplayThread.java
@@ -90,8 +90,6 @@ public class TeleGPSDisplayThread extends Thread {
 					voice.speak("Height %s.\n",
 						    AltosConvert.height.say(state.height()));
 				}
-			} else {
-				voice.speak("Height is unknown.\n");
 			}
 		}