diff options
author | Bdale Garbee <bdale@gag.com> | 2012-10-23 09:38:36 -0600 |
---|---|---|
committer | Bdale Garbee <bdale@gag.com> | 2012-10-23 09:38:36 -0600 |
commit | 055f3232decc07e064d596469b81cf9869411c2d (patch) | |
tree | cc5ebf8283ca00cbe1344f6ed808feaf7e9575ad /altosui/AltosInfoTable.java | |
parent | 8ca58e20208495ce63b8256a8ffa43932867e8d5 (diff) | |
parent | 9e60fa214ad2c48fbe8f7e5c437681aa35d249fa (diff) |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'altosui/AltosInfoTable.java')
-rw-r--r-- | altosui/AltosInfoTable.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/altosui/AltosInfoTable.java b/altosui/AltosInfoTable.java index 86e02ab1..11d1b0c1 100644 --- a/altosui/AltosInfoTable.java +++ b/altosui/AltosInfoTable.java @@ -114,8 +114,8 @@ public class AltosInfoTable extends JTable { info_add_row(0, "Max height", "%6.0f m", state.max_height); info_add_row(0, "Acceleration", "%8.1f m/s²", state.acceleration); info_add_row(0, "Max acceleration", "%8.1f m/s²", state.max_acceleration); - info_add_row(0, "Speed", "%8.1f m/s", state.ascent ? state.speed : state.baro_speed); - info_add_row(0, "Max Speed", "%8.1f m/s", state.max_speed); + info_add_row(0, "Speed", "%8.1f m/s", state.speed()); + info_add_row(0, "Max Speed", "%8.1f m/s", state.max_accel_speed); info_add_row(0, "Temperature", "%9.2f °C", state.temperature); info_add_row(0, "Battery", "%9.2f V", state.battery); if (state.drogue_sense != AltosRecord.MISSING) |