projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't exit on dfu-util errors, it's not reliable about reporting success
[fw/altos]
/
altosuilib
/
AltosFlightStatsTable.java
diff --git
a/altosuilib/AltosFlightStatsTable.java
b/altosuilib/AltosFlightStatsTable.java
index 70a5611049e1b569dc5a4b66871e66560d44fcbe..415c024484fac4895695c21e2c055034853c23c0 100644
(file)
--- a/
altosuilib/AltosFlightStatsTable.java
+++ b/
altosuilib/AltosFlightStatsTable.java
@@
-16,12
+16,12
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altosuilib_1
1
;
+package org.altusmetrum.altosuilib_1
2
;
import java.awt.*;
import javax.swing.*;
import java.util.*;
import java.awt.*;
import javax.swing.*;
import java.util.*;
-import org.altusmetrum.altoslib_1
1
.*;
+import org.altusmetrum.altoslib_1
2
.*;
public class AltosFlightStatsTable extends JComponent implements AltosFontListener {
GridBagLayout layout;
public class AltosFlightStatsTable extends JComponent implements AltosFontListener {
GridBagLayout layout;
@@
-138,11
+138,11
@@
public class AltosFlightStatsTable extends JComponent implements AltosFontListen
String.format("%6.1f m/s²", stats.state_accel[AltosLib.ao_flight_boost]),
String.format("%5.0f ft/s²", AltosConvert.meters_to_feet(stats.state_accel[AltosLib.ao_flight_boost])),
String.format("%6.2f G", AltosConvert.meters_to_g(stats.state_accel[AltosLib.ao_flight_boost])));
String.format("%6.1f m/s²", stats.state_accel[AltosLib.ao_flight_boost]),
String.format("%5.0f ft/s²", AltosConvert.meters_to_feet(stats.state_accel[AltosLib.ao_flight_boost])),
String.format("%6.2f G", AltosConvert.meters_to_g(stats.state_accel[AltosLib.ao_flight_boost])));
- if (stats.state_
start[AltosLib.ao_flight_boost] < stats.state_end[AltosLib.ao_flight_coast]
) {
+ if (stats.state_
time[AltosLib.ao_flight_boost] != 0 || stats.state_time[AltosLib.ao_flight_fast] != 0 || stats.state_time[AltosLib.ao_flight_coast] != 0
) {
- double boost_time = stats.state_
end[AltosLib.ao_flight_boost] - stats.state_start
[AltosLib.ao_flight_boost];
- double fast_time = stats.state_
end[AltosLib.ao_flight_fast] - stats.state_start
[AltosLib.ao_flight_fast];
- double coast_time = stats.state_
end[AltosLib.ao_flight_coast] - stats.state_start
[AltosLib.ao_flight_coast];
+ double boost_time = stats.state_
time
[AltosLib.ao_flight_boost];
+ double fast_time = stats.state_
time
[AltosLib.ao_flight_fast];
+ double coast_time = stats.state_
time
[AltosLib.ao_flight_coast];
if (fast_time > 0) {
new FlightStat(layout, y++, "Ascent time",
if (fast_time > 0) {
new FlightStat(layout, y++, "Ascent time",
@@
-175,10
+175,10
@@
public class AltosFlightStatsTable extends JComponent implements AltosFontListen
new FlightStat(layout, y++, "Main descent rate",
String.format("%6.1f m/s", -stats.state_speed[AltosLib.ao_flight_main]),
String.format("%5.0f ft/s", -AltosConvert.meters_to_feet(stats.state_speed[AltosLib.ao_flight_main])));
new FlightStat(layout, y++, "Main descent rate",
String.format("%6.1f m/s", -stats.state_speed[AltosLib.ao_flight_main]),
String.format("%5.0f ft/s", -AltosConvert.meters_to_feet(stats.state_speed[AltosLib.ao_flight_main])));
- if (stats.state_
start[AltosLib.ao_flight_drogue] < stats.state_end[AltosLib.ao_flight_main]
) {
- double drogue_duration = stats.state_
end[AltosLib.ao_flight_drogue] - stats.state_start
[AltosLib.ao_flight_drogue];
- double main_duration = stats.
landed_time - stats.state_start
[AltosLib.ao_flight_main];
- double duration =
stats.landed_time - stats.state_start[AltosLib.ao_flight_drogue]
;
+ if (stats.state_
time[AltosLib.ao_flight_drogue] != 0 || stats.state_time[AltosLib.ao_flight_main] != 0
) {
+ double drogue_duration = stats.state_
time
[AltosLib.ao_flight_drogue];
+ double main_duration = stats.
state_time
[AltosLib.ao_flight_main];
+ double duration =
drogue_duration + main_duration
;
if (drogue_duration > 0 && main_duration > 0) {
new FlightStat(layout, y++, "Descent time",
if (drogue_duration > 0 && main_duration > 0) {
new FlightStat(layout, y++, "Descent time",
@@
-191,15
+191,15
@@
public class AltosFlightStatsTable extends JComponent implements AltosFontListen
String.format("%6.1f s", duration));
}
}
String.format("%6.1f s", duration));
}
}
- if (stats.
state_start[AltosLib.ao_flight_boost] < stats.state_start[AltosLib.ao_flight_landed]
)
+ if (stats.
landed_time > stats.boost_time
)
new FlightStat(layout, y++, "Flight time",
String.format("%6.1f s", stats.landed_time - stats.boost_time));
new FlightStat(layout, y++, "Flight time",
String.format("%6.1f s", stats.landed_time - stats.boost_time));
- if (stats.pad_lat != AltosLib.MISSING) {
+ if (stats.
has_gps && stats.
pad_lat != AltosLib.MISSING) {
new FlightStat(layout, y++, "Pad location",
pos(stats.pad_lat,"N","S"),
pos(stats.pad_lon,"E","W"));
}
new FlightStat(layout, y++, "Pad location",
pos(stats.pad_lat,"N","S"),
pos(stats.pad_lon,"E","W"));
}
- if (stats.lat != AltosLib.MISSING) {
+ if (stats.
has_gps && stats.
lat != AltosLib.MISSING) {
new FlightStat(layout, y++, "Last reported location",
pos(stats.lat,"N","S"),
pos(stats.lon,"E","W"));
new FlightStat(layout, y++, "Last reported location",
pos(stats.lat,"N","S"),
pos(stats.lon,"E","W"));