projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump java lib versions in preparation for 1.9.2
[fw/altos]
/
altoslib
/
AltosTelemetryLocation.java
diff --git
a/altoslib/AltosTelemetryLocation.java
b/altoslib/AltosTelemetryLocation.java
index 6819fec8c5b9898c133032449db3197bf4795ff8..7a281fdf7422f81253ea42fbca786f97f5486b44 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
2
;
+package org.altusmetrum.altoslib_1
4
;
public class AltosTelemetryLocation extends AltosTelemetryStandard {
public class AltosTelemetryLocation extends AltosTelemetryStandard {
@@
-49,10
+49,12
@@
public class AltosTelemetryLocation extends AltosTelemetryStandard {
super(bytes);
}
super(bytes);
}
- public void provide_data(AltosDataListener listener
, AltosCalData cal_data
) {
- super.provide_data(listener
, cal_data
);
+ public void provide_data(AltosDataListener listener) {
+ super.provide_data(listener);
- AltosGPS gps = cal_data.make_temp_gps(tick(), false);
+ AltosCalData cal_data = listener.cal_data();
+
+ AltosGPS gps = listener.make_temp_gps(false);
int flags = flags();
gps.nsat = flags & 0xf;
int flags = flags();
gps.nsat = flags & 0xf;
@@
-75,12
+77,7
@@
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;
-
- if (gps.nsat >= 4)
- cal_data.set_gps(gps);
}
}
- listener.set_gps(gps);
- cal_data.set_gps(gps);
- cal_data.reset_temp_gps();
+ listener.set_gps(gps, true, false);
}
}
}
}