projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Eliminate warnings in FAT code
[fw/altos]
/
altoslib
/
AltosEepromMetrum2.java
diff --git
a/altoslib/AltosEepromMetrum2.java
b/altoslib/AltosEepromMetrum2.java
index 3b49483960bba25e18127c66a6f9218a8d8e47ad..f1bca6dc14344b118597ce25dafc1eb877e7f453 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.*;
@@
-133,12
+133,11
@@
public class AltosEepromMetrum2 extends AltosEeprom {
gps.nsat = (flags & AltosLib.AO_GPS_NUM_SAT_MASK) >>
AltosLib.AO_GPS_NUM_SAT_SHIFT;
gps.nsat = (flags & AltosLib.AO_GPS_NUM_SAT_MASK) >>
AltosLib.AO_GPS_NUM_SAT_SHIFT;
- gps.year = year();
+ gps.year =
2000 +
year();
gps.month = month();
gps.day = day();
break;
case AltosLib.AO_LOG_GPS_SAT:
gps.month = month();
gps.day = day();
break;
case AltosLib.AO_LOG_GPS_SAT:
- state.set_tick(tick);
gps = state.make_temp_gps(true);
int n = nsat();
gps = state.make_temp_gps(true);
int n = nsat();
@@
-153,7
+152,7
@@
public class AltosEepromMetrum2 extends AltosEeprom {
}
static public LinkedList<AltosEeprom> read(FileInputStream input) {
}
static public LinkedList<AltosEeprom> read(FileInputStream input) {
- LinkedList<AltosEeprom> me
ga
s = new LinkedList<AltosEeprom>();
+ LinkedList<AltosEeprom> me
trum
s = new LinkedList<AltosEeprom>();
for (;;) {
try {
for (;;) {
try {
@@
-161,9
+160,10
@@
public class AltosEepromMetrum2 extends AltosEeprom {
if (line == null)
break;
try {
if (line == null)
break;
try {
- AltosEepromMetrum2 mega = new AltosEepromMetrum2(line);
- if (mega.cmd != AltosLib.AO_LOG_INVALID)
- megas.add(mega);
+ AltosEepromMetrum2 metrum = new AltosEepromMetrum2(line);
+
+ if (metrum.cmd != AltosLib.AO_LOG_INVALID)
+ metrums.add(metrum);
} catch (Exception e) {
System.out.printf ("exception\n");
}
} catch (Exception e) {
System.out.printf ("exception\n");
}
@@
-172,6
+172,6
@@
public class AltosEepromMetrum2 extends AltosEeprom {
}
}
}
}
- return me
ga
s;
+ return me
trum
s;
}
}
}
}