Merge branch 'master' into new-state

[fw/altos] / altosui / AltosEepromDownload.java

diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java
index 53d5433f0146e45aa19756f4ae13b1a5ebe2526f..95b17e2ae39c9133e6a0ac8589a2ac19c0574c26 100644 (file)
--- a/altosui/AltosEepromDownload.java
+++ b/altosui/AltosEepromDownload.java
@@ -289,7 +289,8 @@ public class AltosEepromDownload implements Runnable {
 
                                if (r.cmd == Altos.AO_LOG_STATE && r.data16(0) == Altos.ao_flight_landed)
                                        done = true;
-                               any_valid = true;
+                               if (r.cmd != AltosLib.AO_LOG_INVALID)
+                                       any_valid = true;
                                LogMega(r);
                        } catch (ParseException pe) {
                                if (parse_exception == null)
@@ -416,9 +417,12 @@ public class AltosEepromDownload implements Runnable {
                        case AltosLib.AO_LOG_FORMAT_TELEMEGA:
                                extension = "mega";
                                CaptureMega(eechunk);
-                       case AltosLib.AO_LOG_FORMAT_MINI:
-                               extension = "mini";
+                               break;
+                       case AltosLib.AO_LOG_FORMAT_EASYMINI:
+                       case AltosLib.AO_LOG_FORMAT_TELEMINI:
+                               extension = "eeprom";
                                CaptureMini(eechunk);
+                               break;
                        }
                }
                CheckFile(true);