X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosFlightStats.java;h=98f13dac50965e6fc43b5be336b1bb949b70b84a;hb=44c0cecabb3a815dbf7f52e6b2dad364cc72b60c;hp=87e04293c4fa91a8684aaa38908a78cc27531207;hpb=0a6c76fc0525d6588a1d88127f0085f13a02f1af;p=fw%2Faltos diff --git a/altoslib/AltosFlightStats.java b/altoslib/AltosFlightStats.java index 87e04293..98f13dac 100644 --- a/altoslib/AltosFlightStats.java +++ b/altoslib/AltosFlightStats.java @@ -3,7 +3,8 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,7 +16,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altoslib_4; +package org.altusmetrum.altoslib_11; import java.io.*; @@ -35,8 +36,12 @@ public class AltosFlightStats { 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_other_adc; + public boolean has_gps_sats; + public boolean has_gps_detail; + public boolean has_flight_adc; + public boolean has_battery; public boolean has_rssi; public boolean has_imu; public boolean has_mag; @@ -48,12 +53,12 @@ public class AltosFlightStats { for (AltosState s : states) { state = s; - if (state.state == AltosLib.ao_flight_landed) + if (state.state() == AltosLib.ao_flight_landed) break; } if (state == null) - return 0; + return AltosLib.MISSING; double landed_height = state.height(); @@ -61,7 +66,7 @@ public class AltosFlightStats { boolean above = true; - double landed_time = -1000; + double landed_time = AltosLib.MISSING; for (AltosState s : states) { state = s; @@ -69,14 +74,12 @@ public class AltosFlightStats { if (state.height() > landed_height + 10) { above = true; } else { - if (above && state.height() < landed_height + 2) { + if (above && Math.abs(state.height() - landed_height) < 2) { above = false; landed_time = state.time; } } } - if (landed_time == -1000) - landed_time = state.time; return landed_time; } @@ -88,14 +91,12 @@ public class AltosFlightStats { state = s; if (state.acceleration() < 1) boost_time = state.time; - if (state.state >= AltosLib.ao_flight_boost && state.state <= AltosLib.ao_flight_landed) + if (state.state() >= AltosLib.ao_flight_boost && state.state() <= AltosLib.ao_flight_landed) break; } if (state == null) - return 0; + return AltosLib.MISSING; - if (boost_time == AltosLib.MISSING) - boost_time = state.time; return boost_time; } @@ -109,28 +110,46 @@ public class AltosFlightStats { hour = minute = second = AltosLib.MISSING; serial = flight = AltosLib.MISSING; lat = lon = AltosLib.MISSING; + has_flight_data = false; has_gps = false; - has_other_adc = false; + has_gps_sats = false; + has_flight_adc = false; + has_battery = false; has_rssi = false; has_imu = false; has_mag = false; has_orient = false; + + for (int s = AltosLib.ao_flight_startup; s <= AltosLib.ao_flight_landed; s++) { + state_count[s] = 0; + state_speed[s] = 0.0; + state_accel[s] = 0.0; + } + for (AltosState state : states) { if (serial == AltosLib.MISSING && state.serial != AltosLib.MISSING) serial = state.serial; 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; - int state_id = state.state; - if (state.time >= boost_time && state_id < AltosLib.ao_flight_boost) + if (state.pressure() != AltosLib.MISSING) + has_flight_data = true; + + int state_id = state.state(); + if (boost_time != AltosLib.MISSING && state.time >= boost_time && state_id < AltosLib.ao_flight_boost) { state_id = AltosLib.ao_flight_boost; - if (state.time >= landed_time && state_id < AltosLib.ao_flight_landed) + } + if (landed_time != AltosLib.MISSING && state.time >= landed_time && state_id < AltosLib.ao_flight_landed) { state_id = AltosLib.ao_flight_landed; + } + if (state.gps != null && state.gps.locked) { year = state.gps.year; month = state.gps.month; @@ -139,6 +158,11 @@ public class AltosFlightStats { 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(); @@ -151,19 +175,19 @@ public class AltosFlightStats { 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_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; + if (state.gps.cc_gps_sat != null) + has_gps_sats = true; + if (state.gps.course != AltosLib.MISSING) + has_gps_detail = true; } if (state.imu != null) has_imu = true; @@ -178,6 +202,9 @@ public class AltosFlightStats { 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;