X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fapp%2Fsrc%2Fmain%2Fjava%2Forg%2Faltusmetrum%2FAltosDroid%2FTabPad.java;h=fd997612725530357ab9a593b802835d729c632d;hb=HEAD;hp=f526857f00ccedb3a67011dc9b606309dc2394f1;hpb=ec46adee44ea08120b1940ca55a5fbdf56874bb1;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 f526857f..fd997612 100644
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabPad.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabPad.java
@@ -62,9 +62,12 @@ 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) {
+		AltosDebug.debug("TabPad onCreateView\n");
 		View v = inflater.inflate(R.layout.tab_pad, container, false);
 		battery_voltage_view = (TextView) v.findViewById(R.id.battery_voltage_value);
 		battery_lights = new GoNoGoLights((ImageView) v.findViewById(R.id.battery_redled),
@@ -107,6 +110,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;
@@ -152,12 +158,15 @@ public class TabPad extends AltosDroidTab {
 		receiver_latitude_view = (TextView) v.findViewById(R.id.receiver_lat_value);
 		receiver_longitude_view = (TextView) v.findViewById(R.id.receiver_lon_value);
 		receiver_altitude_view = (TextView) v.findViewById(R.id.receiver_alt_value);
-        return v;
+
+		AltosDebug.debug("TabPad onCreateView done battery_voltage_view %s\n", battery_voltage_view);
+		return v;
 	}
 
 	public String tab_name() { return AltosDroid.tab_pad_name; }
 
 	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+		AltosDebug.debug("pad show state %b bvv %s\n", state != null, battery_voltage_view);
 		if (state != null) {
 			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);
@@ -213,8 +222,18 @@ 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);
@@ -229,8 +248,11 @@ public class TabPad extends AltosDroidTab {
 			double altitude = AltosLib.MISSING;
 			if (receiver.hasAltitude())
 				altitude = receiver.getAltitude();
-			receiver_latitude_view.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));
-			receiver_longitude_view.setText(AltosDroid.pos(receiver.getLongitude(), "E", "W"));
+			String lat_text = AltosDroid.pos(receiver.getLatitude(), "N", "S");
+			String lon_text = AltosDroid.pos(receiver.getLongitude(), "E", "W");
+			AltosDebug.debug("lat %s lon %s\n", lat_text, lon_text);
+			receiver_latitude_view.setText(lat_text);
+			receiver_longitude_view.setText(lon_text);
 			set_value(receiver_altitude_view, AltosConvert.height, 1, altitude);
 		}
 	}