projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Expose telemetry altitude macros even without GPS
[fw/altos]
/
altoslib
/
AltosFlightStats.java
diff --git
a/altoslib/AltosFlightStats.java
b/altoslib/AltosFlightStats.java
index 87e04293c4fa91a8684aaa38908a78cc27531207..1b88cb9fc7e56e7b8b2abf7ae308571837c862ad 100644
(file)
--- a/
altoslib/AltosFlightStats.java
+++ b/
altoslib/AltosFlightStats.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
;
import java.io.*;
import java.io.*;
@@
-35,8
+35,10
@@
public class AltosFlightStats {
public int hour, minute, second;
public double lat, lon;
public double pad_lat, pad_lon;
public int hour, minute, second;
public double lat, lon;
public double pad_lat, pad_lon;
+ public boolean has_flight_data;
public boolean has_gps;
public boolean has_gps;
- public boolean has_other_adc;
+ public boolean has_flight_adc;
+ public boolean has_battery;
public boolean has_rssi;
public boolean has_imu;
public boolean has_mag;
public boolean has_rssi;
public boolean has_imu;
public boolean has_mag;
@@
-109,8
+111,10
@@
public class AltosFlightStats {
hour = minute = second = AltosLib.MISSING;
serial = flight = AltosLib.MISSING;
lat = lon = AltosLib.MISSING;
hour = minute = second = AltosLib.MISSING;
serial = flight = AltosLib.MISSING;
lat = lon = AltosLib.MISSING;
+ has_flight_data = false;
has_gps = false;
has_gps = false;
- has_other_adc = false;
+ has_flight_adc = false;
+ has_battery = false;
has_rssi = false;
has_imu = false;
has_mag = false;
has_rssi = false;
has_imu = false;
has_mag = false;
@@
-121,11
+125,16
@@
public class AltosFlightStats {
if (flight == AltosLib.MISSING && state.flight != AltosLib.MISSING)
flight = state.flight;
if (state.battery_voltage != AltosLib.MISSING)
if (flight == AltosLib.MISSING && state.flight != AltosLib.MISSING)
flight = state.flight;
if (state.battery_voltage != AltosLib.MISSING)
- has_other_adc = true;
+ has_battery = true;
+ if (state.main_voltage != AltosLib.MISSING)
+ has_flight_adc = true;
if (state.rssi != AltosLib.MISSING)
has_rssi = true;
end_time = state.time;
if (state.rssi != AltosLib.MISSING)
has_rssi = true;
end_time = state.time;
+ if (state.pressure() != AltosLib.MISSING)
+ has_flight_data = true;
+
int state_id = state.state;
if (state.time >= boost_time && state_id < AltosLib.ao_flight_boost)
state_id = AltosLib.ao_flight_boost;
int state_id = state.state;
if (state.time >= boost_time && state_id < AltosLib.ao_flight_boost)
state_id = AltosLib.ao_flight_boost;
@@
-139,6
+148,11
@@
public class AltosFlightStats {
minute = state.gps.minute;
second = state.gps.second;
}
minute = state.gps.minute;
second = state.gps.second;
}
+ max_height = state.max_height();
+ max_speed = state.max_speed();
+ max_acceleration = state.max_acceleration();
+ max_gps_height = state.max_gps_height();
+
if (0 <= state_id && state_id < AltosLib.ao_flight_invalid) {
double acceleration = state.acceleration();
double speed = state.speed();
if (0 <= state_id && state_id < AltosLib.ao_flight_invalid) {
double acceleration = state.acceleration();
double speed = state.speed();
@@
-151,16
+165,12
@@
public class AltosFlightStats {
state_start[state_id] = state.time;
if (state_end[state_id] < state.time)
state_end[state_id] = state.time;
state_start[state_id] = state.time;
if (state_end[state_id] < state.time)
state_end[state_id] = state.time;
- max_height = state.max_height();
- max_speed = state.max_speed();
-
max_acceleration = state.max_acceleration()
;
-
max_gps_height = state.max_gps_height()
;
+ }
+ if (state.pad_lat != AltosLib.MISSING) {
+
pad_lat = state.pad_lat
;
+
pad_lon = state.pad_lon
;
}
if (state.gps != null && state.gps.locked && state.gps.nsat >= 4) {
}
if (state.gps != null && state.gps.locked && state.gps.nsat >= 4) {
- if (state_id <= AltosLib.ao_flight_pad) {
- pad_lat = state.gps.lat;
- pad_lon = state.gps.lon;
- }
lat = state.gps.lat;
lon = state.gps.lon;
has_gps = true;
lat = state.gps.lat;
lon = state.gps.lon;
has_gps = true;
@@
-178,6
+188,9
@@
public class AltosFlightStats {
if (state_count[s] > 0) {
state_speed[s] /= state_count[s];
state_accel[s] /= state_count[s];
if (state_count[s] > 0) {
state_speed[s] /= state_count[s];
state_accel[s] /= state_count[s];
+ } else {
+ state_speed[s] = AltosLib.MISSING;
+ state_accel[s] = AltosLib.MISSING;
}
if (state_start[s] == 0)
state_start[s] = end_time;
}
if (state_start[s] == 0)
state_start[s] = end_time;