projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Document how to add a new product
[fw/altos]
/
altoslib
/
AltosState.java
diff --git
a/altoslib/AltosState.java
b/altoslib/AltosState.java
index b3bcff925cfe9ed390cbb0ae46ad4d0ebccfed0d..28fdbb244c3afffd6da9e530da4c84fce71bafec 100644
(file)
--- a/
altoslib/AltosState.java
+++ b/
altoslib/AltosState.java
@@
-20,7
+20,7
@@
* Track flight state from telemetry or eeprom data stream
*/
* Track flight state from telemetry or eeprom data stream
*/
-package org.altusmetrum.altoslib_1
3
;
+package org.altusmetrum.altoslib_1
4
;
public class AltosState extends AltosDataListener {
public class AltosState extends AltosDataListener {
@@
-307,13
+307,12
@@
public class AltosState extends AltosDataListener {
class AltosGpsGroundAltitude extends AltosValue {
void set(double a, double t) {
super.set(a, t);
class AltosGpsGroundAltitude extends AltosValue {
void set(double a, double t) {
super.set(a, t);
- pad_alt = value();
+
gps_altitude.set_gps_height();
}
void set_filtered(double a, double t) {
super.set_filtered(a, t);
gps_altitude.set_gps_height();
}
void set_filtered(double a, double t) {
super.set_filtered(a, t);
- pad_alt = value();
gps_altitude.set_gps_height();
}
gps_altitude.set_gps_height();
}
@@
-513,26
+512,27
@@
public class AltosState extends AltosDataListener {
}
public double height() {
}
public double height() {
- double k = kalman_height.value();
- if (k != AltosLib.MISSING)
- return k;
-
double b = baro_height();
if (b != AltosLib.MISSING)
return b;
double b = baro_height();
if (b != AltosLib.MISSING)
return b;
+ double k = kalman_height.value();
+ if (k != AltosLib.MISSING)
+ return k;
+
return gps_height();
}
public double max_height() {
return gps_height();
}
public double max_height() {
- double k = kalman_height.max();
- if (k != AltosLib.MISSING)
- return k;
-
double a = altitude.max();
double g = ground_altitude();
if (a != AltosLib.MISSING && g != AltosLib.MISSING)
return a - g;
double a = altitude.max();
double g = ground_altitude();
if (a != AltosLib.MISSING && g != AltosLib.MISSING)
return a - g;
+
+ double k = kalman_height.max();
+ if (k != AltosLib.MISSING)
+ return k;
+
return max_gps_height();
}
return max_gps_height();
}
@@
-692,7
+692,7
@@
public class AltosState extends AltosDataListener {
public double gps_height;
public double gps_height;
- public double pad_lat, pad_lon
, pad_alt
;
+ public double pad_lat, pad_lon;
public int speak_tick;
public double speak_altitude;
public int speak_tick;
public double speak_altitude;
@@
-703,6
+703,8
@@
public class AltosState extends AltosDataListener {
public int pyro_fired;
public int pyro_fired;
+ public double motor_pressure;
+
public void set_npad(int npad) {
this.npad = npad;
gps_waiting = MIN_PAD_SAMPLES - npad;
public void set_npad(int npad) {
this.npad = npad;
gps_waiting = MIN_PAD_SAMPLES - npad;
@@
-774,7
+776,6
@@
public class AltosState extends AltosDataListener {
pad_lat = AltosLib.MISSING;
pad_lon = AltosLib.MISSING;
pad_lat = AltosLib.MISSING;
pad_lon = AltosLib.MISSING;
- pad_alt = AltosLib.MISSING;
gps_altitude = new AltosGpsAltitude();
gps_ground_altitude = new AltosGpsGroundAltitude();
gps_altitude = new AltosGpsAltitude();
gps_ground_altitude = new AltosGpsGroundAltitude();
@@
-860,10
+861,6
@@
public class AltosState extends AltosDataListener {
}
}
}
}
- public String state_name() {
- return AltosLib.state_name(state());
- }
-
public void set_state(int state) {
super.set_state(state);
ascent = (AltosLib.ao_flight_boost <= state() &&
public void set_state(int state) {
super.set_state(state);
ascent = (AltosLib.ao_flight_boost <= state() &&
@@
-888,8
+885,8
@@
public class AltosState extends AltosDataListener {
received_time = ms;
}
received_time = ms;
}
- public void set_gps(AltosGPS gps) {
- super.set_gps(gps);
+ public void set_gps(AltosGPS gps
, boolean set_location, boolean set_sats
) {
+ super.set_gps(gps
, set_location, set_sats
);
if (gps != null) {
this.gps = gps;
update_gps();
if (gps != null) {
this.gps = gps;
update_gps();
@@
-1052,6
+1049,10
@@
public class AltosState extends AltosDataListener {
this.pyro_fired = fired;
}
this.pyro_fired = fired;
}
+ public void set_motor_pressure(double motor_pressure) {
+ this.motor_pressure = motor_pressure;
+ }
+
public AltosState() {
init();
}
public AltosState() {
init();
}