From: Keith Packard <keithp@keithp.com>
Date: Tue, 7 Jun 2011 04:10:43 +0000 (-0700)
Subject: altosui: teleterra mockup - fix speed values
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=refs%2Fheads%2Fteleterra-mockup;p=fw%2Faltos

altosui: teleterra mockup - fix speed values

Display ascent speed during ascent, otherwise descent speed

Signed-off-by: Keith Packard <keithp@keithp.com>
---

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"),