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

diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java
index 8f7a8544..8fbd661b 100644
--- a/altosui/AltosEepromDownload.java
+++ b/altosui/AltosEepromDownload.java
@@ -17,18 +17,13 @@
 
 package altosui;
 
-import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
 import java.io.*;
 import java.util.*;
 import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
-
-import libaltosJNI.*;
+import org.altusmetrum.altoslib_1.*;
 
 public class AltosEepromDownload implements Runnable {
 
@@ -112,7 +107,7 @@ public class AltosEepromDownload implements Runnable {
 
 		extension = "eeprom";
 		set_serial(flights.config_data.serial);
-		for (int i = 0; i < eechunk.chunk_size && !done; i += AltosEepromRecord.record_length) {
+		for (int i = 0; i < AltosEepromChunk.chunk_size && !done; i += AltosEepromRecord.record_length) {
 			try {
 				AltosEepromRecord r = new AltosEepromRecord(eechunk, i);
 				if (r.cmd == Altos.AO_LOG_FLIGHT)
@@ -133,7 +128,8 @@ public class AltosEepromDownload implements Runnable {
 				}
 				if (r.cmd == Altos.AO_LOG_STATE && r.a == Altos.ao_flight_landed)
 					done = true;
-				any_valid = true;
+				if (r.cmd != AltosLib.AO_LOG_INVALID)
+					any_valid = true;
 				Log(r);
 			} catch (ParseException pe) {
 				if (parse_exception == null)
@@ -218,7 +214,7 @@ public class AltosEepromDownload implements Runnable {
 		boolean	any_valid = false;
 
 		extension = "science";
-		for (int i = 0; i < eechunk.chunk_size && !done; i += AltosEepromTeleScience.record_length) {
+		for (int i = 0; i < AltosEepromChunk.chunk_size && !done; i += AltosEepromTeleScience.record_length) {
 			try {
 				AltosEepromTeleScience r = new AltosEepromTeleScience(eechunk, i);
 				if (r.type == AltosEepromTeleScience.AO_LOG_TELESCIENCE_START) {
@@ -271,7 +267,7 @@ public class AltosEepromDownload implements Runnable {
 
 		extension = "mega";
 		set_serial(flights.config_data.serial);
-		for (int i = 0; i < eechunk.chunk_size && !done; i += AltosEepromMega.record_length) {
+		for (int i = 0; i < AltosEepromChunk.chunk_size && !done; i += AltosEepromMega.record_length) {
 			try {
 				AltosEepromMega r = new AltosEepromMega(eechunk, i);
 				if (r.cmd == Altos.AO_LOG_FLIGHT)
@@ -287,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;
 				}
 
@@ -318,11 +314,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;
@@ -337,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(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);
 
@@ -356,23 +350,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);
 			}