projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump to version 1.8.1.1/android 16 for altosdroid
[fw/altos]
/
altoslib
/
AltosEepromRecordSet.java
diff --git
a/altoslib/AltosEepromRecordSet.java
b/altoslib/AltosEepromRecordSet.java
index 69159cdf905a02ab7945e1394b33bf1082c0ffee..48e90c055e0269be6136385ac50935e411d4505e 100644
(file)
--- a/
altoslib/AltosEepromRecordSet.java
+++ b/
altoslib/AltosEepromRecordSet.java
@@
-12,13
+12,13
@@
* General Public License for more details.
*/
* General Public License for more details.
*/
-package org.altusmetrum.altoslib_1
1
;
+package org.altusmetrum.altoslib_1
2
;
import java.io.*;
import java.util.*;
public class AltosEepromRecordSet implements AltosRecordSet {
import java.io.*;
import java.util.*;
public class AltosEepromRecordSet implements AltosRecordSet {
- AltosEeprom
New
eeprom;
+ AltosEeprom
eeprom;
TreeSet<AltosEepromRecord> ordered;
AltosCalData cal_data;
TreeSet<AltosEepromRecord> ordered;
AltosCalData cal_data;
@@
-33,6
+33,7
@@
public class AltosEepromRecordSet implements AltosRecordSet {
if (record.cmd() == AltosLib.AO_LOG_FLIGHT) {
cal_data.set_tick(record.tick());
cal_data.set_boost_tick();
if (record.cmd() == AltosLib.AO_LOG_FLIGHT) {
cal_data.set_tick(record.tick());
cal_data.set_boost_tick();
+ break;
}
}
}
}
}
}
@@
-41,12
+42,15
@@
public class AltosEepromRecordSet implements AltosRecordSet {
public void capture_series(AltosDataListener listener) {
AltosCalData cal_data = cal_data();
public void capture_series(AltosDataListener listener) {
AltosCalData cal_data = cal_data();
+
+ cal_data.reset();
for (AltosEepromRecord record : ordered) {
record.provide_data(listener, cal_data);
}
for (AltosEepromRecord record : ordered) {
record.provide_data(listener, cal_data);
}
+ listener.finish();
}
}
- public AltosEepromRecordSet(AltosEeprom
New
eeprom) {
+ public AltosEepromRecordSet(AltosEeprom eeprom) {
this.eeprom = eeprom;
AltosConfigData config_data = eeprom.config_data();
this.eeprom = eeprom;
AltosConfigData config_data = eeprom.config_data();
@@
-71,7
+75,8
@@
public class AltosEepromRecordSet implements AltosRecordSet {
break;
case AltosLib.AO_LOG_FORMAT_TELEMINI2:
case AltosLib.AO_LOG_FORMAT_TELEMINI3:
break;
case AltosLib.AO_LOG_FORMAT_TELEMINI2:
case AltosLib.AO_LOG_FORMAT_TELEMINI3:
- case AltosLib.AO_LOG_FORMAT_EASYMINI:
+ case AltosLib.AO_LOG_FORMAT_EASYMINI1:
+ case AltosLib.AO_LOG_FORMAT_EASYMINI2:
record = new AltosEepromRecordMini(eeprom);
break;
case AltosLib.AO_LOG_FORMAT_TELEGPS:
record = new AltosEepromRecordMini(eeprom);
break;
case AltosLib.AO_LOG_FORMAT_TELEGPS:
@@
-109,7
+114,7
@@
public class AltosEepromRecordSet implements AltosRecordSet {
}
}
}
}
- public AltosEepromRecordSet(
Reader
input) throws IOException {
- this(new AltosEeprom
New
(input));
+ public AltosEepromRecordSet(
InputStream
input) throws IOException {
+ this(new AltosEeprom(input));
}
}
}
}