projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
a few config tweaks
[fw/altos]
/
altoslib
/
AltosTelemetryLocation.java
diff --git
a/altoslib/AltosTelemetryLocation.java
b/altoslib/AltosTelemetryLocation.java
index 8ad23ab6396fe69ebdd5ed078ee279f30f8fdd38..60a1d68cbfd3fe47d68158066c12f7ede478e1d3 100644
(file)
--- a/
altoslib/AltosTelemetryLocation.java
+++ b/
altoslib/AltosTelemetryLocation.java
@@
-16,7
+16,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
1
;
+package org.altusmetrum.altoslib_1
4
;
public class AltosTelemetryLocation extends AltosTelemetryStandard {
public class AltosTelemetryLocation extends AltosTelemetryStandard {
@@
-49,14
+49,21
@@
public class AltosTelemetryLocation extends AltosTelemetryStandard {
super(bytes);
}
super(bytes);
}
- public void update_state(AltosState state) {
- super.update_state(state);
- AltosGPS gps = state.make_temp_gps(false);
+ public void provide_data(AltosDataListener listener) {
+
+ AltosCalData cal_data = listener.cal_data();
+
+ AltosGPS gps = listener.make_temp_gps(false);
int flags = flags();
gps.nsat = flags & 0xf;
gps.locked = (flags & (1 << 4)) != 0;
gps.connected = (flags & (1 << 5)) != 0;
int flags = flags();
gps.nsat = flags & 0xf;
gps.locked = (flags & (1 << 4)) != 0;
gps.connected = (flags & (1 << 5)) != 0;
+ gps.pdop = pdop() / 10.0;
+ gps.hdop = hdop() / 10.0;
+ gps.vdop = vdop() / 10.0;
+ if (gps.connected)
+ super.provide_data(listener);
if (gps.locked) {
gps.lat = latitude() * 1.0e-7;
if (gps.locked) {
gps.lat = latitude() * 1.0e-7;
@@
-71,10
+78,8
@@
public class AltosTelemetryLocation extends AltosTelemetryStandard {
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;
- gps.pdop = pdop() / 10.0;
- gps.hdop = hdop() / 10.0;
- gps.vdop = vdop() / 10.0;
}
}
- state.set_temp_gps();
+ if (gps.connected)
+ listener.set_gps(gps, true, false);
}
}
}
}