projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telemini-v2.0: Enable beep config and radio rate config
[fw/altos]
/
altoslib
/
AltosState.java
diff --git
a/altoslib/AltosState.java
b/altoslib/AltosState.java
index 6926994c4292b7c6d19ef9e21ce98e32346f8767..5e7908af135402642abf1d7824a34943ad43954e 100644
(file)
--- a/
altoslib/AltosState.java
+++ b/
altoslib/AltosState.java
@@
-19,7
+19,7
@@
* Track flight state from telemetry or eeprom data stream
*/
* Track flight state from telemetry or eeprom data stream
*/
-package org.altusmetrum.altoslib_
4
;
+package org.altusmetrum.altoslib_
5
;
public class AltosState implements Cloneable {
public class AltosState implements Cloneable {
@@
-481,7
+481,7
@@
public class AltosState implements Cloneable {
double g = ground_altitude();
if (a != AltosLib.MISSING && g != AltosLib.MISSING)
return a - g;
double g = ground_altitude();
if (a != AltosLib.MISSING && g != AltosLib.MISSING)
return a - g;
- return
AltosLib.MISSING
;
+ return
gps_height()
;
}
public double max_height() {
}
public double max_height() {
@@
-749,6
+749,7
@@
public class AltosState implements Cloneable {
speak_altitude = AltosLib.MISSING;
callsign = null;
speak_altitude = AltosLib.MISSING;
callsign = null;
+ firmware_version = null;
accel_plus_g = AltosLib.MISSING;
accel_minus_g = AltosLib.MISSING;
accel_plus_g = AltosLib.MISSING;
accel_minus_g = AltosLib.MISSING;
@@
-886,6
+887,7
@@
public class AltosState implements Cloneable {
speak_altitude = old.speak_altitude;
callsign = old.callsign;
speak_altitude = old.speak_altitude;
callsign = old.callsign;
+ firmware_version = old.firmware_version;
accel_plus_g = old.accel_plus_g;
accel_minus_g = old.accel_minus_g;
accel_plus_g = old.accel_plus_g;
accel_minus_g = old.accel_minus_g;
@@
-908,8
+910,8
@@
public class AltosState implements Cloneable {
}
void update_gps() {
}
void update_gps() {
- elevation =
0
;
- range =
-1
;
+ elevation =
AltosLib.MISSING
;
+ range =
AltosLib.MISSING
;
if (gps == null)
return;
if (gps == null)
return;
@@
-1022,15
+1024,21
@@
public class AltosState implements Cloneable {
firmware_version = version;
}
firmware_version = version;
}
+ private void re_init() {
+ int bt = boost_tick;
+ int rs = receiver_serial;
+ init();
+ boost_tick = bt;
+ receiver_serial = rs;
+ }
+
public void set_flight(int flight) {
/* When the flight changes, reset the state */
public void set_flight(int flight) {
/* When the flight changes, reset the state */
- if (flight != AltosLib.MISSING
&& flight != 0
) {
+ if (flight != AltosLib.MISSING) {
if (this.flight != AltosLib.MISSING &&
this.flight != flight) {
if (this.flight != AltosLib.MISSING &&
this.flight != flight) {
- int bt = boost_tick;
- init();
- boost_tick = bt;
+ re_init();
}
this.flight = flight;
}
}
this.flight = flight;
}
@@
-1041,9
+1049,7
@@
public class AltosState implements Cloneable {
if (serial != AltosLib.MISSING) {
if (this.serial != AltosLib.MISSING &&
this.serial != serial) {
if (serial != AltosLib.MISSING) {
if (this.serial != AltosLib.MISSING &&
this.serial != serial) {
- int bt = boost_tick;
- init();
- boost_tick = bt;
+ re_init();
}
this.serial = serial;
}
}
this.serial = serial;
}