projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Start integrated value at 0 by default
[fw/altos]
/
altoslib
/
AltosEepromMetrum2.java
diff --git
a/altoslib/AltosEepromMetrum2.java
b/altoslib/AltosEepromMetrum2.java
index 5a616e6cd835aeff3cf781f2569a2d64deb7410b..ea38edf2c2cef76b034eaa0a51ed3247b9c60b95 100644
(file)
--- a/
altoslib/AltosEepromMetrum2.java
+++ b/
altoslib/AltosEepromMetrum2.java
@@
-71,6
+71,8
@@
public class AltosEepromMetrum2 extends AltosEeprom {
}
public void update_state(AltosState state) {
}
public void update_state(AltosState state) {
+ super.update_state(state);
+
AltosGPS gps;
/* Flush any pending GPS changes */
AltosGPS gps;
/* Flush any pending GPS changes */
@@
-89,11
+91,8
@@
public class AltosEepromMetrum2 extends AltosEeprom {
}
}
}
}
- if (cmd != AltosLib.AO_LOG_FLIGHT)
- state.set_tick(tick);
switch (cmd) {
case AltosLib.AO_LOG_FLIGHT:
switch (cmd) {
case AltosLib.AO_LOG_FLIGHT:
- state.set_boost_tick(tick);
state.set_flight(flight());
state.set_ground_accel(ground_accel());
state.set_ground_pressure(ground_pres());
state.set_flight(flight());
state.set_ground_accel(ground_accel());
state.set_ground_pressure(ground_pres());
@@
-115,13
+114,13
@@
public class AltosEepromMetrum2 extends AltosEeprom {
break;
case AltosLib.AO_LOG_GPS_POS:
break;
case AltosLib.AO_LOG_GPS_POS:
- gps = state.make_temp_gps();
+ gps = state.make_temp_gps(
false
);
gps.lat = latitude() / 1e7;
gps.lon = longitude() / 1e7;
gps.alt = altitude();
break;
case AltosLib.AO_LOG_GPS_TIME:
gps.lat = latitude() / 1e7;
gps.lon = longitude() / 1e7;
gps.alt = altitude();
break;
case AltosLib.AO_LOG_GPS_TIME:
- gps = state.make_temp_gps();
+ gps = state.make_temp_gps(
false
);
gps.hour = hour();
gps.minute = minute();
gps.hour = hour();
gps.minute = minute();
@@
-134,13
+133,12
@@
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();
+ gps = state.make_temp_gps(true);
int n = nsat();
for (int i = 0; i < n; i++)
int n = nsat();
for (int i = 0; i < n; i++)
@@
-154,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 {
@@
-162,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");
}
@@
-173,6
+172,6
@@
public class AltosEepromMetrum2 extends AltosEeprom {
}
}
}
}
- return me
ga
s;
+ return me
trum
s;
}
}
}
}