altos/test: Adjust CRC error rate after FEC fix

[fw/altos] / altoslib / AltosEepromDownload.java

diff --git a/altoslib/AltosEepromDownload.java b/altoslib/AltosEepromDownload.java
index 280414f8e9a32d5b81906ec50a7fd6b73c527519..a3c15112318c7cae3c4503ba3ce1d50849190c95 100644 (file)
--- a/altoslib/AltosEepromDownload.java
+++ b/altoslib/AltosEepromDownload.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_13;
+package org.altusmetrum.altoslib_14;
 
 import java.io.*;
 import java.util.*;
@@ -26,6 +26,8 @@ import java.util.concurrent.*;
 class AltosEepromNameData extends AltosDataListener {
        AltosGPS        gps = null;
 
+       boolean avoid_duplicate_files = false;
+
        public void set_rssi(int rssi, int status) { }
        public void set_received_time(long received_time) { }
 
@@ -39,8 +41,12 @@ class AltosEepromNameData extends AltosDataListener {
        public void set_apogee_voltage(double volts) { }
        public void set_main_voltage(double volts) { }
 
-       public void set_gps(AltosGPS gps) {
-               super.set_gps(gps);
+       public void set_avoid_duplicate_files() {
+               avoid_duplicate_files = true;
+       }
+
+       public void set_gps(AltosGPS gps, boolean set_location, boolean set_sats) {
+               super.set_gps(gps, set_location, set_sats);
                if (gps != null &&
                    gps.year != AltosLib.MISSING &&
                    gps.month != AltosLib.MISSING &&
@@ -65,6 +71,7 @@ class AltosEepromNameData extends AltosDataListener {
        public void set_companion(AltosCompanion companion) { }
        public void set_kalman(double height, double speed, double acceleration) { }
        public void set_orient(double new_orient) { }
+       public void set_motor_pressure(double motor_pressure) { }
 
        public AltosEepromNameData(AltosCalData cal_data) {
                super(cal_data);
@@ -96,12 +103,19 @@ public class AltosEepromDownload implements Runnable {
        private AltosFile MakeFile(int serial, int flight, AltosEepromNameData name_data) throws IOException {
                AltosFile               eeprom_name;
 
-               if (name_data.gps != null) {
-                       AltosGPS                gps = name_data.gps;
-                       eeprom_name = new AltosFile(gps.year, gps.month, gps.day,
-                                                   serial, flight, "eeprom");
-               } else
-                       eeprom_name = new AltosFile(serial, flight, "eeprom");
+               for (;;) {
+                       if (name_data.gps != null) {
+                               AltosGPS                gps = name_data.gps;
+                               eeprom_name = new AltosFile(gps.year, gps.month, gps.day,
+                                                           serial, flight, "eeprom");
+                       } else
+                               eeprom_name = new AltosFile(serial, flight, "eeprom");
+                       if (!name_data.avoid_duplicate_files)
+                               break;
+                       if (!eeprom_name.exists())
+                               break;
+                       flight++;
+               }
 
                return eeprom_name;
        }