projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump version to 1.4.1.1
[fw/altos]
/
altoslib
/
AltosTelemetryLocation.java
diff --git
a/altoslib/AltosTelemetryLocation.java
b/altoslib/AltosTelemetryLocation.java
index 67705cde57750df8d724f0011b34ab04383799db..32ca76087153c7ffe39a09d0b7e88406af8313b1 100644
(file)
--- a/
altoslib/AltosTelemetryLocation.java
+++ b/
altoslib/AltosTelemetryLocation.java
@@
-15,7
+15,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_
4
;
+package org.altusmetrum.altoslib_
5
;
public class AltosTelemetryLocation extends AltosTelemetryStandard {
public class AltosTelemetryLocation extends AltosTelemetryStandard {
@@
-36,7
+36,6
@@
public class AltosTelemetryLocation extends AltosTelemetryStandard {
int ground_speed;
int climb_rate;
int course;
int ground_speed;
int climb_rate;
int course;
- int state;
public AltosTelemetryLocation(int[] bytes) {
super(bytes);
public AltosTelemetryLocation(int[] bytes) {
super(bytes);
@@
-58,7
+57,6
@@
public class AltosTelemetryLocation extends AltosTelemetryStandard {
ground_speed = uint16(26);
climb_rate = int16(28);
course = uint8(30);
ground_speed = uint16(26);
climb_rate = int16(28);
course = uint8(30);
- state = uint8(31);
}
public void update_state(AltosState state) {
}
public void update_state(AltosState state) {
@@
-68,7
+66,6
@@
public class AltosTelemetryLocation extends AltosTelemetryStandard {
gps.nsat = flags & 0xf;
gps.locked = (flags & (1 << 4)) != 0;
gps.connected = (flags & (1 << 5)) != 0;
gps.nsat = flags & 0xf;
gps.locked = (flags & (1 << 4)) != 0;
gps.connected = (flags & (1 << 5)) != 0;
- gps.state = this.state;
if (gps.locked) {
gps.lat = latitude * 1.0e-7;
if (gps.locked) {
gps.lat = latitude * 1.0e-7;