Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

1 files changed, 4 insertions, 1 deletions

diff --git a/altosui/AltosLanded.java b/altosui/AltosLanded.java
index 57c2d476..5e073f7d 100644
--- a/altosui/AltosLanded.java
+++ b/altosui/AltosLanded.java
@@ -173,7 +173,7 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 
 	class Speed extends LandedValue {
 		void show (AltosState state, int crc_errors) {
-			show(AltosConvert.speed, state.max_speed);
+			show(AltosConvert.speed, state.max_speed());
 		}
 		public Speed (GridBagLayout layout, int y) {
 			super (layout, y, "Maximum Speed");
@@ -250,6 +250,9 @@ public class AltosLanded extends JComponent implements AltosFlightDisplay, Actio
 					} else if (filename.endsWith("telem")) {
 						FileInputStream in = new FileInputStream(file);
 						records = new AltosTelemetryIterable(in);
+					} else if (filename.endsWith("mega")) {
+						FileInputStream in = new FileInputStream(file);
+						records = new AltosEepromMegaIterable(in);
 					} else {
 						throw new FileNotFoundException(filename);
 					}