X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosEepromDownload.java;h=801d4ec0ec4d874908d811e22f4d9eecba2faa47;hb=6ba0df9b440b69bf5bc5f4e435b431adf303fee2;hp=a8cb24ff0c287f670c255a5524a12ded19a8c524;hpb=c9fa8faabb6f7fb59714c42e1029ce3d71c52ff8;p=fw%2Faltos

diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java
index a8cb24ff..801d4ec0 100644
--- a/altosui/AltosEepromDownload.java
+++ b/altosui/AltosEepromDownload.java
@@ -23,7 +23,7 @@ import java.io.*;
 import java.util.*;
 import java.text.*;
 import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_1.*;
 
 public class AltosEepromDownload implements Runnable {
 
@@ -283,7 +283,7 @@ public class AltosEepromDownload implements Runnable {
 				if (r.cmd == Altos.AO_LOG_GPS_TIME) {
 					year = 2000 + r.data8(14);
 					month = r.data8(15);
-					day = r.data8(14);
+					day = r.data8(16);
 					want_file = true;
 				}
 
@@ -314,7 +314,7 @@ public class AltosEepromDownload implements Runnable {
 		done = false;
 		start = true;
 
-		if (flights.config_data.serial == 0)
+		if (flights.config_data.serial < 0)
 			throw new IOException("no serial number found");
 
 		/* Reset per-capture variables */
@@ -331,7 +331,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(AltosLib.state_name(state), state, block - state_block);
+			monitor.set_value(AltosLib.state_name(state), state, block - state_block, block - log.start_block);
 
 			AltosEepromChunk	eechunk = new AltosEepromChunk(serial_line, block, block == log.start_block);