projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master'
[fw/altos]
/
altoslib
/
AltosEepromMetrum2.java
diff --git
a/altoslib/AltosEepromMetrum2.java
b/altoslib/AltosEepromMetrum2.java
index ea38edf2c2cef76b034eaa0a51ed3247b9c60b95..d13aac42863d5b2e8f8bdc718682d65c0ed95aa5 100644
(file)
--- a/
altoslib/AltosEepromMetrum2.java
+++ b/
altoslib/AltosEepromMetrum2.java
@@
-15,7
+15,7
@@
* 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
;
+package org.altusmetrum.altoslib_
3
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-59,7
+59,7
@@
public class AltosEepromMetrum2 extends AltosEeprom {
public int year() { return data8(4); }
public int month() { return data8(5); }
public int day() { return data8(6); }
public int year() { return data8(4); }
public int month() { return data8(5); }
public int day() { return data8(6); }
-
+
/* AO_LOG_GPS_SAT elements */
public int nsat() { return data8(0); }
public int more() { return data8(1); }
/* AO_LOG_GPS_SAT elements */
public int nsat() { return data8(0); }
public int more() { return data8(1); }
@@
-161,7
+161,7
@@
public class AltosEepromMetrum2 extends AltosEeprom {
break;
try {
AltosEepromMetrum2 metrum = new AltosEepromMetrum2(line);
break;
try {
AltosEepromMetrum2 metrum = new AltosEepromMetrum2(line);
-
+
if (metrum.cmd != AltosLib.AO_LOG_INVALID)
metrums.add(metrum);
} catch (Exception e) {
if (metrum.cmd != AltosLib.AO_LOG_INVALID)
metrums.add(metrum);
} catch (Exception e) {