diff options
| author | Keith Packard <keithp@keithp.com> | 2011-06-06 21:10:43 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-06-06 21:10:43 -0700 |
| commit | b825a2e9d83b709e104f5678ad37ded23ea3cea0 (patch) | |
| tree | edfcb6760da88383c5d1df0aaffa061b852c3b6e | |
| parent | 7e875d6c051ef0948de8cbd8773d13e85e2c49f7 (diff) | |
altosui: teleterra mockup - fix speed valuesteleterra-mockup
Display ascent speed during ascent, otherwise descent speed
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | altosui/AltosTerra.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/altosui/AltosTerra.java b/altosui/AltosTerra.java index 20ad137f..bf48bee7 100644 --- a/altosui/AltosTerra.java +++ b/altosui/AltosTerra.java @@ -116,6 +116,10 @@ public class AltosTerra } public void display() { + double speed = current_state.speed; + if (!current_state.ascent) + speed = current_state.baro_speed; + switch (displayed_tab) { default: case info_tab: @@ -140,7 +144,7 @@ public class AltosTerra break; case ascent_tab: setLine(0, "S:%5d S⌈%5d%c", - (int) Math.floor(current_state.speed + 0.5), + (int) Math.floor(speed + 0.5), (int) Math.floor(current_state.max_speed + 0.5), state_char(current_state)); setLine(1, "H:%5d H⌈%5d", @@ -154,7 +158,7 @@ public class AltosTerra state_char(current_state)); setLine(1, "H%5d S%5d", (int) Math.floor(current_state.height + 0.5), - (int) Math.floor(current_state.baro_speed + 0.5)); + (int) Math.floor(speed + 0.5)); break; case landing_tab: setLine(0, "%s%c", pos(current_state.gps.lat, "N", "S"), |