altoslib,altosuilib,altosui: log_format/device_type TeleGPS selects stateless

[fw/altos] / altoslib / AltosEepromRecordSet.java

diff --git a/altoslib/AltosEepromRecordSet.java b/altoslib/AltosEepromRecordSet.java
index 1f10e677ee29540d9731c55749d73778eaf26d8d..d91ae3ac1c1aba278cd21eedc03c3de3cad802a2 100644 (file)
--- a/altoslib/AltosEepromRecordSet.java
+++ b/altoslib/AltosEepromRecordSet.java
@@ -12,13 +12,13 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_12;
 
 import java.io.*;
 import java.util.*;
 
 public class AltosEepromRecordSet implements AltosRecordSet {
-       AltosEepromNew                  eeprom;
+       AltosEeprom                     eeprom;
        TreeSet<AltosEepromRecord>      ordered;
        AltosCalData                    cal_data;
 
@@ -44,13 +44,15 @@ public class AltosEepromRecordSet implements AltosRecordSet {
                AltosCalData    cal_data = cal_data();
 
                cal_data.reset();
+               listener.set_log_format(config_data().log_format);
+
                for (AltosEepromRecord record : ordered) {
                        record.provide_data(listener, cal_data);
                }
                listener.finish();
        }
 
-       public AltosEepromRecordSet(AltosEepromNew eeprom) {
+       public AltosEepromRecordSet(AltosEeprom eeprom) {
                this.eeprom = eeprom;
 
                AltosConfigData         config_data = eeprom.config_data();
@@ -115,6 +117,6 @@ public class AltosEepromRecordSet implements AltosRecordSet {
        }
 
        public AltosEepromRecordSet(InputStream input) throws IOException {
-               this(new AltosEepromNew(input));
+               this(new AltosEeprom(input));
        }
 }