X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosEepromDownload.java;h=4a35c2f1c299b8bbb9121d2565fc7284a5e6208c;hb=ea957f9e6144f8411ac84ee2905700f55f5a6e8a;hp=8f7a8544dc4a57f5b2820115e9c8622fa4de4894;hpb=1824761f5b98e92485e2dd347b1c4d043ec207e2;p=fw%2Faltos

diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java
index 8f7a8544..4a35c2f1 100644
--- a/altosui/AltosEepromDownload.java
+++ b/altosui/AltosEepromDownload.java
@@ -27,6 +27,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
 
 import libaltosJNI.*;
 
@@ -318,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;
@@ -356,23 +355,23 @@ public class AltosEepromDownload implements Runnable {
 			}
 
 			switch (log_format) {
-			case Altos.AO_LOG_FORMAT_FULL:
+			case AltosLib.AO_LOG_FORMAT_FULL:
 				extension = "eeprom";
 				CaptureFull(eechunk);
 				break;
-			case Altos.AO_LOG_FORMAT_TINY:
+			case AltosLib.AO_LOG_FORMAT_TINY:
 				extension = "eeprom";
 				CaptureTiny(eechunk);
 				break;
-			case Altos.AO_LOG_FORMAT_TELEMETRY:
+			case AltosLib.AO_LOG_FORMAT_TELEMETRY:
 				extension = "telem";
 				CaptureTelemetry(eechunk);
 				break;
-			case Altos.AO_LOG_FORMAT_TELESCIENCE:
+			case AltosLib.AO_LOG_FORMAT_TELESCIENCE:
 				extension = "science";
 				CaptureTeleScience(eechunk);
 				break;
-			case Altos.AO_LOG_FORMAT_MEGAMETRUM:
+			case AltosLib.AO_LOG_FORMAT_MEGAMETRUM:
 				extension = "mega";
 				CaptureMega(eechunk);
 			}