X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosEepromDownload.java;h=f305ed336ece9d7c9f68bc753deab5107c5dae65;hp=280414f8e9a32d5b81906ec50a7fd6b73c527519;hb=bcf609837eefd431415c979942a31abda1227eb9;hpb=ee7a54b3215ffa1eb38f16a151c0740b14b60857 diff --git a/altoslib/AltosEepromDownload.java b/altoslib/AltosEepromDownload.java index 280414f8..f305ed33 100644 --- a/altoslib/AltosEepromDownload.java +++ b/altoslib/AltosEepromDownload.java @@ -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,6 +41,10 @@ class AltosEepromNameData extends AltosDataListener { public void set_apogee_voltage(double volts) { } public void set_main_voltage(double volts) { } + public void set_avoid_duplicate_files() { + avoid_duplicate_files = true; + } + public void set_gps(AltosGPS gps) { super.set_gps(gps); if (gps != null && @@ -96,12 +102,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; }