altosui: Accept serial number of zero for eeprom download

[fw/altos] / altosui / AltosEepromDownload.java

diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java
index d72943099944a6c524f964da8ad7f8f73f1ae49d..a5e99749d9c12cb25cd035af04398df4b30e1442 100644 (file)
--- a/altosui/AltosEepromDownload.java
+++ b/altosui/AltosEepromDownload.java
@@ -107,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)
@@ -214,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) {
@@ -267,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)
@@ -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 */