altoslib: Create data file open helper in AltosLib

[fw/altos] / altoslib / AltosEepromFile.java

diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java
index 7f6299131087b61e39baa6c8e0dc2c3cc5df028f..463948b11b20e769510b296994a2e0dbd3afc58f 100644 (file)
--- a/altoslib/AltosEepromFile.java
+++ b/altoslib/AltosEepromFile.java
@@ -22,14 +22,10 @@ import java.io.*;
 import java.util.*;
 import java.text.*;
 
-public class AltosEepromFile extends AltosStateIterable implements AltosRecordSet {
+public class AltosEepromFile implements AltosRecordSet {
 
        AltosEepromRecordSet    set;
 
-       public AltosConfigData config_data() {
-               return set.eeprom.config_data();
-       }
-
        public void write_comments(PrintStream out) {
        }
 
@@ -37,15 +33,19 @@ public class AltosEepromFile extends AltosStateIterable implements AltosRecordSe
                out.printf("%s\n", set.eeprom.toString());
        }
 
-       public AltosEepromFile(Reader input) throws IOException {
+       public AltosEepromFile(InputStream input) throws IOException {
                set = new AltosEepromRecordSet(input);
        }
 
-       public Iterator<AltosState> iterator() {
-               return set.iterator();
+       public AltosConfigData config_data() {
+               return set.config_data();
+       }
+
+       public AltosCalData cal_data() {
+               return set.cal_data();
        }
 
-       public void capture_series(AltosFlightSeries series) {
+       public void capture_series(AltosDataListener series) {
                set.capture_series(series);
        }
 }