X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fapp%2Fsrc%2Fmain%2Fjava%2Forg%2Faltusmetrum%2FAltosDroid%2FTabFlight.java;h=ba45c47eff202c4ab185b9798e91ff7a11f573c1;hb=76b288f8d02e0a48f04de9455a2dd0b77e48bd63;hp=b2e7e197aae77617ecafc6d2c523dd920daa094a;hpb=d7ef39ba104a1ac6024af875c730a645f282719f;p=fw%2Faltos

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabFlight.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabFlight.java
index b2e7e197..ba45c47e 100644
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabFlight.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabFlight.java
@@ -18,7 +18,7 @@
 
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_13.*;
+import org.altusmetrum.altoslib_14.*;
 
 import android.os.Bundle;
 import android.view.*;
@@ -83,16 +83,16 @@ public class TabFlight extends AltosDroidTab {
 
 	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (state != null) {
-			set_value(speed_view, AltosConvert.speed, 6, state.speed());
-			set_value(height_view, AltosConvert.height, 6, state.height());
-			set_value(max_speed_view, AltosConvert.speed, 6, state.max_speed());
-			set_value(max_height_view, AltosConvert.height, 6, state.max_height());
+			set_value(speed_view, AltosConvert.speed, 1, state.speed());
+			set_value(height_view, AltosConvert.height, 1, state.height());
+			set_value(max_speed_view, AltosConvert.speed, 1, state.max_speed());
+			set_value(max_height_view, AltosConvert.height, 1, state.max_height());
 			if (from_receiver != null) {
-				elevation_view.setText(AltosDroid.number("%3.0f°", from_receiver.elevation));
-				set_value(range_view, AltosConvert.distance, 6, from_receiver.range);
-				bearing_view.setText(AltosDroid.number("%3.0f°", from_receiver.bearing));
+				elevation_view.setText(AltosDroid.number("%1.0f°", from_receiver.elevation));
+				set_value(range_view, AltosConvert.distance, 1, from_receiver.range);
+				bearing_view.setText(AltosDroid.number("%1.0f°", from_receiver.bearing));
 				compass_view.setText(from_receiver.bearing_words(AltosGreatCircle.BEARING_LONG));
-				set_value(distance_view, AltosConvert.distance, 6, from_receiver.distance);
+				set_value(distance_view, AltosConvert.distance, 1, from_receiver.distance);
 			} else { 
 				elevation_view.setText("<unknown>");
 				range_view.setText("<unknown>");
@@ -108,7 +108,7 @@ public class TabFlight extends AltosDroidTab {
 			if (state.apogee_voltage == AltosLib.MISSING) {
 				apogee_view.setVisibility(View.GONE);
 			} else {
-				apogee_voltage_view.setText(AltosDroid.number("%4.2f V", state.apogee_voltage));
+				apogee_voltage_view.setText(AltosDroid.number("%1.2f V", state.apogee_voltage));
 				apogee_lights.set(state.apogee_voltage > 3.2, state.apogee_voltage == AltosLib.MISSING);
 				apogee_view.setVisibility(View.VISIBLE);
 			}
@@ -116,7 +116,7 @@ public class TabFlight extends AltosDroidTab {
 			if (state.main_voltage == AltosLib.MISSING) {
 				main_view.setVisibility(View.GONE);
 			} else {
-				main_voltage_view.setText(AltosDroid.number("%4.2f V", state.main_voltage));
+				main_voltage_view.setText(AltosDroid.number("%1.2f V", state.main_voltage));
 				main_lights.set(state.main_voltage > 3.2, state.main_voltage == AltosLib.MISSING);
 				main_view.setVisibility(View.VISIBLE);
 			}