X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosEepromDownload.java;h=b04890cdb35a5ebd28285cc80b565beb8511df1e;hb=67da878f740a387d0092631ad672e024d26e4192;hp=080bfc99cfa94c4e248e5c18e86c7b55751a6f95;hpb=3c2f601139d36761de6a8a2210545d082ef16133;p=fw%2Faltos

diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java
index 080bfc99..b04890cd 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;
@@ -338,7 +336,7 @@ public class AltosEepromDownload implements Runnable {
 
 		state = 0; state_block = log.start_block;
 		for (block = log.start_block; !done && block < log.end_block; block++) {
-			monitor.set_value(Altos.state_to_string[state], state, block - state_block);
+			monitor.set_value(AltosLib.state_name(state), state, block - state_block);
 
 			AltosEepromChunk	eechunk = new AltosEepromChunk(serial_line, block, block == log.start_block);
 
@@ -357,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);
 			}