From c7c2fc2d85414fefda0a7948a6c4e38f65140861 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 23 Jul 2017 16:38:09 -0700 Subject: [PATCH] altosui: Adapt to flight stats time value changes There aren't state time values anymore as those don't work when you have multiple motors. Instead, 'boost_time' is when the rocket left the pad and 'landed_time' is when it touched down. Use these new values in the --summary output. Signed-off-by: Keith Packard --- altosui/AltosUI.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java index 26591738..a5a2078d 100644 --- a/altosui/AltosUI.java +++ b/altosui/AltosUI.java @@ -520,11 +520,12 @@ public class AltosUI extends AltosUIFrame { System.out.printf("Main rate: %6.0f m/s %6.0f ft/s\n", stats.state_speed[Altos.ao_flight_main], AltosConvert.meters_to_feet(stats.state_speed[Altos.ao_flight_main])); - if (stats.state_end[Altos.ao_flight_main] != AltosLib.MISSING && - stats.state_start[Altos.ao_flight_boost] != AltosLib.MISSING) + if (stats.landed_time != AltosLib.MISSING && + stats.boost_time != AltosLib.MISSING && + stats.landed_time > stats.boost_time) System.out.printf("Flight time: %6.0f s\n", - stats.state_end[Altos.ao_flight_main] - - stats.state_start[Altos.ao_flight_boost]); + stats.landed_time - + stats.boost_time); System.out.printf("\n"); return true; } -- 2.30.2