projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Ship EasyMini v2.0 firwmare
[fw/altos]
/
altoslib
/
AltosEepromFile.java
diff --git
a/altoslib/AltosEepromFile.java
b/altoslib/AltosEepromFile.java
index 7f6299131087b61e39baa6c8e0dc2c3cc5df028f..839f0aa0dff23f35e591b68e1d308933c3452b2a 100644
(file)
--- a/
altoslib/AltosEepromFile.java
+++ b/
altoslib/AltosEepromFile.java
@@
-16,20
+16,16
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_1
1
;
+package org.altusmetrum.altoslib_1
3
;
import java.io.*;
import java.util.*;
import java.text.*;
import java.io.*;
import java.util.*;
import java.text.*;
-public class AltosEepromFile
extends AltosStateIterable
implements AltosRecordSet {
+public class AltosEepromFile implements AltosRecordSet {
AltosEepromRecordSet set;
AltosEepromRecordSet set;
- public AltosConfigData config_data() {
- return set.eeprom.config_data();
- }
-
public void write_comments(PrintStream out) {
}
public void write_comments(PrintStream out) {
}
@@
-37,15
+33,19
@@
public class AltosEepromFile extends AltosStateIterable implements AltosRecordSe
out.printf("%s\n", set.eeprom.toString());
}
out.printf("%s\n", set.eeprom.toString());
}
- public AltosEepromFile(
Reader
input) throws IOException {
+ public AltosEepromFile(
InputStream
input) throws IOException {
set = new AltosEepromRecordSet(input);
}
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(Altos
FlightSeries
series) {
+ public void capture_series(Altos
DataListener
series) {
set.capture_series(series);
}
}
set.capture_series(series);
}
}