projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib,altosuilib: Bump library version numbers
[fw/altos]
/
altoslib
/
AltosTelemetryLocation.java
diff --git
a/altoslib/AltosTelemetryLocation.java
b/altoslib/AltosTelemetryLocation.java
index 5eb727d651d30068cc3cd979d8cbea99e2fb8b39..6819fec8c5b9898c133032449db3197bf4795ff8 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
2
;
public class AltosTelemetryLocation extends AltosTelemetryStandard {
public class AltosTelemetryLocation extends AltosTelemetryStandard {
@@
-52,12
+52,15
@@
public class AltosTelemetryLocation extends AltosTelemetryStandard {
public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
super.provide_data(listener, cal_data);
public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
super.provide_data(listener, cal_data);
- AltosGPS gps =
new AltosGPS(
);
+ AltosGPS gps =
cal_data.make_temp_gps(tick(), 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.locked) {
gps.lat = latitude() * 1.0e-7;
if (gps.locked) {
gps.lat = latitude() * 1.0e-7;
@@
-72,13
+75,12
@@
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;
if (gps.nsat >= 4)
if (gps.nsat >= 4)
- cal_data.set_gps
_altitude(gps.alt
);
+ cal_data.set_gps
(gps
);
}
listener.set_gps(gps);
}
listener.set_gps(gps);
+ cal_data.set_gps(gps);
+ cal_data.reset_temp_gps();
}
}
}
}