name change from MegaMetrum to TeleMega

[fw/altos] / altosui / AltosEepromDownload.java

diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java
index a5e99749d9c12cb25cd035af04398df4b30e1442..a0523b58a2c00ea8734c614479994a617ef6249d 100644 (file)
--- 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;
                                }
 
@@ -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);
 
@@ -366,7 +366,7 @@ public class AltosEepromDownload implements Runnable {
                                extension = "science";
                                CaptureTeleScience(eechunk);
                                break;
-                       case AltosLib.AO_LOG_FORMAT_MEGAMETRUM:
+                       case AltosLib.AO_LOG_FORMAT_TELEMEGA:
                                extension = "mega";
                                CaptureMega(eechunk);
                        }