X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fapp%2Fsrc%2Fmain%2Fjava%2Forg%2Faltusmetrum%2FAltosDroid%2FTabPad.java;h=4a8b3f862b9bbeed9077133fc6e8a5b1b1f84f69;hb=eb39995ded6b564efcb5a5312119d2672b437bc8;hp=6e343f9fbe7a109bd9b50dcda6c8a84de40a2d66;hpb=d7ef39ba104a1ac6024af875c730a645f282719f;p=fw%2Faltos

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabPad.java
index 6e343f9f..4a8b3f86 100644
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabPad.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabPad.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.*;
@@ -62,6 +62,8 @@ public class TabPad extends AltosDroidTab {
 	private TextView[] ignite_voltage_label = new TextView[4];
 	private GoNoGoLights[] ignite_lights = new GoNoGoLights[4];
 
+	private View tilt_view;
+	private TextView tilt_value;
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -107,6 +109,9 @@ public class TabPad extends AltosDroidTab {
 		                                   (ImageView) v.findViewById(R.id.gps_ready_greenled),
 		                                   getResources());
 
+		tilt_view 	= (View) v.findViewById(R.id.tilt_view);
+		tilt_value 	= (TextView) v.findViewById(R.id.tilt_value);
+
 		for (int i = 0; i < 4; i++) {
 			int row_id, view_id, label_id, lights_id;
 			int red_id, green_id;
@@ -159,19 +164,19 @@ public class TabPad extends AltosDroidTab {
 
 	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (state != null) {
-			battery_voltage_view.setText(AltosDroid.number(" %4.2f V", state.battery_voltage));
+			battery_voltage_view.setText(AltosDroid.number("%1.2f V", state.battery_voltage));
 			battery_lights.set(state.battery_voltage >= AltosLib.ao_battery_good, state.battery_voltage == AltosLib.MISSING);
 			if (state.apogee_voltage == AltosLib.MISSING) {
 				apogee_row.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_row.setVisibility(View.VISIBLE);
 			}
 			apogee_lights.set(state.apogee_voltage >= AltosLib.ao_igniter_good, state.apogee_voltage == AltosLib.MISSING);
 			if (state.main_voltage == AltosLib.MISSING) {
 				main_row.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_row.setVisibility(View.VISIBLE);
 			}
 			main_lights.set(state.main_voltage >= AltosLib.ao_igniter_good, state.main_voltage == AltosLib.MISSING);
@@ -183,7 +188,7 @@ public class TabPad extends AltosDroidTab {
 				if (voltage == AltosLib.MISSING) {
 					ignite_row[i].setVisibility(View.GONE);
 				} else {
-					ignite_voltage_view[i].setText(AltosDroid.number(" %4.2f V", voltage));
+					ignite_voltage_view[i].setText(AltosDroid.number("%1.2f V", voltage));
 					ignite_row[i].setVisibility(View.VISIBLE);
 				}
 				ignite_lights[i].set(voltage >= AltosLib.ao_igniter_good, voltage == AltosLib.MISSING);
@@ -213,13 +218,23 @@ public class TabPad extends AltosDroidTab {
 			} else
 				gps_locked_lights.set(false, true);
 			gps_ready_lights.set(state.gps_ready, state.gps == null);
+
+			double orient = state.orient();
+
+			if (orient == AltosLib.MISSING) {
+				tilt_view.setVisibility(View.GONE);
+			} else {
+				tilt_value.setText(AltosDroid.number("%1.0f°", orient));
+				tilt_view.setVisibility(View.VISIBLE);
+			}
 		}
 
+
 		if (telem_state != null) {
 			if (telem_state.receiver_battery == AltosLib.MISSING) {
 				receiver_row.setVisibility(View.GONE);
 			} else {
-				receiver_voltage_view.setText(AltosDroid.number(" %4.2f V", telem_state.receiver_battery));
+				receiver_voltage_view.setText(AltosDroid.number("%1.2f V", telem_state.receiver_battery));
 				receiver_row.setVisibility(View.VISIBLE);
 			}
 			receiver_voltage_lights.set(telem_state.receiver_battery >= AltosLib.ao_battery_good, telem_state.receiver_battery == AltosLib.MISSING);