X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTabPad.java;h=3c168e37d4f69a4740f4a9567b37f6304d478fc7;hp=6906324dd594fd5de27a9e346b5f4011ce1b5cae;hb=3cd8ff18a7546c1e251747ba26240cb130003ef1;hpb=9212ce268f3a4a9f3f019f23f6eef8b57207d340

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
index 6906324d..3c168e37 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
@@ -27,6 +27,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.location.Location;
 
 public class TabPad extends Fragment implements AltosDroidTab {
 	AltosDroid mAltosDroid;
@@ -100,40 +101,48 @@ public class TabPad extends Fragment implements AltosDroidTab {
 		mAltosDroid = null;
 	}
 
-	public void update_ui(AltosState state, AltosGreatCircle from_receiver) {
-		mBatteryVoltageView.setText(String.format("%4.2f V", state.battery));
-		mBatteryLights.set(state.battery > 3.7);
-
-		mApogeeVoltageView.setText(String.format("%4.2f V", state.drogue_sense));
-		mApogeeLights.set(state.drogue_sense > 3.2);
-
-		mMainVoltageView.setText(String.format("%4.2f V", state.main_sense));
-		mMainLights.set(state.main_sense > 3.2);
-
-		if (state.data.flight != 0) {
-			if (state.data.state <= AltosLib.ao_flight_pad)
-				mDataLoggingView.setText("Ready to record");
-			else if (state.data.state < AltosLib.ao_flight_landed)
-				mDataLoggingView.setText("Recording data");
-			else
-				mDataLoggingView.setText("Recorded data");
-		} else {
-			mDataLoggingView.setText("Storage full");
+	public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+		if (state != null) {
+			mBatteryVoltageView.setText(String.format("%4.2f V", state.battery));
+			mBatteryLights.set(state.battery > 3.7);
+
+			mApogeeVoltageView.setText(String.format("%4.2f V", state.drogue_sense));
+			mApogeeLights.set(state.drogue_sense > 3.2);
+
+			mMainVoltageView.setText(String.format("%4.2f V", state.main_sense));
+			mMainLights.set(state.main_sense > 3.2);
+
+			if (state.data.flight != 0) {
+				if (state.data.state <= AltosLib.ao_flight_pad)
+					mDataLoggingView.setText("Ready to record");
+				else if (state.data.state < AltosLib.ao_flight_landed)
+					mDataLoggingView.setText("Recording data");
+				else
+					mDataLoggingView.setText("Recorded data");
+			} else {
+				mDataLoggingView.setText("Storage full");
+			}
+			mDataLoggingLights.set(state.data.flight != 0);
+
+			if (state.gps != null) {
+				mGPSLockedView.setText(String.format("%4d sats", state.gps.nsat));
+				mGPSLockedLights.set(state.gps.locked && state.gps.nsat >= 4);
+				if (state.gps_ready)
+					mGPSReadyView.setText("Ready");
+				else
+					mGPSReadyView.setText(String.format("Waiting %d", state.gps_waiting));
+				mGPSReadyLights.set(state.gps_ready);
+			}
 		}
-		mDataLoggingLights.set(state.data.flight != 0);
 
-		mGPSLockedView.setText(String.format("%4d sats", state.gps.nsat));
-		mGPSLockedLights.set(state.gps.locked && state.gps.nsat >= 4);
-
-		if (state.gps_ready)
-			mGPSReadyView.setText("Ready");
-		else
-			mGPSReadyView.setText(String.format("Waiting %d", state.gps_waiting));
-		mGPSReadyLights.set(state.gps_ready);
-
-		mPadLatitudeView.setText(AltosDroid.pos(state.pad_lat, "N", "S"));
-		mPadLongitudeView.setText(AltosDroid.pos(state.pad_lon, "W", "E"));
-		mPadAltitudeView.setText(String.format("%4.0f m", state.pad_alt));
+		if (receiver != null) {
+			double altitude = 0;
+			if (receiver.hasAltitude())
+				altitude = receiver.getAltitude();
+			mPadLatitudeView.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));
+			mPadLongitudeView.setText(AltosDroid.pos(receiver.getLongitude(), "W", "E"));
+			mPadAltitudeView.setText(String.format("%4.0f m", altitude));
+		}
 	}
 
 }