projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Recover battery voltage from TeleGPS configuration packet
[fw/altos]
/
altoslib
/
AltosState.java
diff --git
a/altoslib/AltosState.java
b/altoslib/AltosState.java
index ddda82b9e4fd3a686ff8cac1eead1b3e8a0a38bd..7871da77b3a73a3bc60edefaa68a6adf1b58c88a 100644
(file)
--- a/
altoslib/AltosState.java
+++ b/
altoslib/AltosState.java
@@
-918,6
+918,9
@@
public class AltosState implements Cloneable {
elevation = from_pad.elevation;
range = from_pad.range;
}
elevation = from_pad.elevation;
range = from_pad.range;
}
+
+ if ((gps.state & AltosGPS.AO_GPS_STATE_VALID) != 0)
+ set_state (gps.state & ~(AltosGPS.AO_GPS_STATE_VALID));
}
public void set_tick(int new_tick) {
}
public void set_tick(int new_tick) {
@@
-956,11
+959,14
@@
public class AltosState implements Cloneable {
this.device_type = device_type;
}
this.device_type = device_type;
}
- public void set_config(int major, int minor, int apogee_delay, int main_deploy, int flight_log_max) {
- config_major = major;
- config_minor = minor;
+ public void set_flight_params(int apogee_delay, int main_deploy) {
this.apogee_delay = apogee_delay;
this.main_deploy = main_deploy;
this.apogee_delay = apogee_delay;
this.main_deploy = main_deploy;
+ }
+
+ public void set_config(int major, int minor, int flight_log_max) {
+ config_major = major;
+ config_minor = minor;
this.flight_log_max = flight_log_max;
}
this.flight_log_max = flight_log_max;
}