projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Create new abstraction underneath AltosState for recording values
[fw/altos]
/
altoslib
/
AltosEepromRecordMega.java
diff --git
a/altoslib/AltosEepromRecordMega.java
b/altoslib/AltosEepromRecordMega.java
index 1c6d1aee90a39747f976d3c73ca60da7e47b93d2..3c5f60b31170c036060f902247c352c4177aa5b0 100644
(file)
--- a/
altoslib/AltosEepromRecordMega.java
+++ b/
altoslib/AltosEepromRecordMega.java
@@
-109,12
+109,12
@@
public class AltosEepromRecordMega extends AltosEepromRecord {
private int svid(int n) { return data8(2 + n * 2); }
private int c_n(int n) { return data8(2 + n * 2 + 1); }
private int svid(int n) { return data8(2 + n * 2); }
private int c_n(int n) { return data8(2 + n * 2 + 1); }
- public void update_state(Altos
State
state) {
+ public void update_state(Altos
FlightListener
state) {
super.update_state(state);
AltosGPS gps;
/* Flush any pending GPS changes */
super.update_state(state);
AltosGPS gps;
/* Flush any pending GPS changes */
- if (state.gps_pending) {
+ if (state.gps_pending
()
) {
switch (cmd()) {
case AltosLib.AO_LOG_GPS_LAT:
case AltosLib.AO_LOG_GPS_LON:
switch (cmd()) {
case AltosLib.AO_LOG_GPS_LAT:
case AltosLib.AO_LOG_GPS_LON:
@@
-186,7
+186,7
@@
public class AltosEepromRecordMega extends AltosEepromRecord {
gps.lat = latitude() / 1e7;
gps.lon = longitude() / 1e7;
gps.lat = latitude() / 1e7;
gps.lon = longitude() / 1e7;
- if (
state
.altitude_32())
+ if (
config_data()
.altitude_32())
gps.alt = (altitude_low() & 0xffff) | (altitude_high() << 16);
else
gps.alt = altitude_low();
gps.alt = (altitude_low() & 0xffff) | (altitude_high() << 16);
else
gps.alt = altitude_low();
@@
-208,7
+208,7
@@
public class AltosEepromRecordMega extends AltosEepromRecord {
gps.ground_speed = ground_speed() * 1.0e-2;
gps.course = course() * 2;
gps.climb_rate = climb_rate() * 1.0e-2;
gps.ground_speed = ground_speed() * 1.0e-2;
gps.course = course() * 2;
gps.climb_rate = climb_rate() * 1.0e-2;
- if (
state
.compare_version("1.4.9") >= 0) {
+ if (
config_data()
.compare_version("1.4.9") >= 0) {
gps.pdop = pdop() / 10.0;
gps.hdop = hdop() / 10.0;
gps.vdop = vdop() / 10.0;
gps.pdop = pdop() / 10.0;
gps.hdop = hdop() / 10.0;
gps.vdop = vdop() / 10.0;