Bump java lib versions to 13

[fw/altos] / altoslib / AltosEepromLog.java

diff --git a/altoslib/AltosEepromLog.java b/altoslib/AltosEepromLog.java
index cc2982071432db8f0f987ba6f7f06466042850b1..0da3e991dcee4b13dd7348771fcd277a44c4d58b 100644 (file)
--- a/altoslib/AltosEepromLog.java
+++ b/altoslib/AltosEepromLog.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,8 +16,9 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_13;
 
+import java.io.*;
 import java.text.*;
 import java.util.concurrent.*;
 
@@ -31,9 +33,15 @@ public class AltosEepromLog {
        public int              start_block;
        public int              end_block;
 
-       public int              year, month, day;
+       public boolean          download_selected;
+       public boolean          delete_selected;
+       public boolean          graph_selected;
 
-       public boolean          selected;
+       public File             file;
+
+       public void set_file(File file) {
+               this.file = file;
+       }
 
        public AltosEepromLog(AltosConfigData config_data,
                              AltosLink link,
@@ -42,7 +50,6 @@ public class AltosEepromLog {
                throws InterruptedException, TimeoutException {
 
                int             block;
-               boolean         has_date = false;
 
                flight = in_flight;
                if (flight != 0)
@@ -52,46 +59,11 @@ public class AltosEepromLog {
                serial = config_data.serial;
 
                /*
-                * Select all flights for download
-                */
-               selected = true;
-
-               /*
-                * Look in TeleMetrum log data for date
+                * Select all flights for download and graph, but not
+                * for delete
                 */
-               if (config_data.log_format == AltosLib.AO_LOG_FORMAT_UNKNOWN ||
-                   config_data.log_format == AltosLib.AO_LOG_FORMAT_FULL)
-               {
-                       /*
-                        * Only look in the first two blocks so that this
-                        * process doesn't take a long time
-                        */
-                       if (in_end_block > in_start_block + 2)
-                               in_end_block = in_start_block + 2;
-
-                       for (block = in_start_block; block < in_end_block; block++) {
-                               AltosEepromChunk eechunk = new AltosEepromChunk(link, block, block == in_start_block);
-
-                               for (int i = 0; i < AltosEepromChunk.chunk_size; i += AltosEepromTM.record_length) {
-                                       try {
-                                               AltosEepromTM r = new AltosEepromTM(eechunk, i);
-
-                                               if (r.cmd == AltosLib.AO_LOG_FLIGHT) {
-                                                       flight = r.b;
-                                                       has_flight = true;
-                                               }
-                                               if (r.cmd == AltosLib.AO_LOG_GPS_DATE) {
-                                                       year = 2000 + (r.a & 0xff);
-                                                       month = (r.a >> 8) & 0xff;
-                                                       day = (r.b & 0xff);
-                                                       has_date = true;
-                                               }
-                                       } catch (ParseException pe) {
-                                       }
-                               }
-                               if (has_date && has_flight)
-                                       break;
-                       }
-               }
+               download_selected = true;
+               delete_selected = false;
+               graph_selected = true;
        }
 }