X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTabPad.java;h=066c1353ef792a87896a18a3522d9623725a0e2d;hb=156e60954fae15bc090984f79cd5594f910ca913;hp=5070ec0bb0a33d765a33bc067a2f9f285bf2a105;hpb=1ec6fb3b9cec0f864d6e65d0cc6b4dd42edd3e16;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
index 5070ec0b..066c1353 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
@@ -102,35 +102,38 @@ public class TabPad extends Fragment implements AltosDroidTab {
 	}
 
 	public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location 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");
-		}
-		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);
+		if (state != null) {
+			mBatteryVoltageView.setText(AltosDroid.number("%4.2f V", state.battery));
+			mBatteryLights.set(state.battery > 3.7, state.battery == AltosRecord.MISSING);
+
+			mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.drogue_sense));
+			mApogeeLights.set(state.drogue_sense > 3.2, state.drogue_sense == AltosRecord.MISSING);
+
+			mMainVoltageView.setText(AltosDroid.number("%4.2f V", state.main_sense));
+			mMainLights.set(state.main_sense > 3.2, state.main_sense == AltosRecord.MISSING);
+
+			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, state.data.flight == AltosRecord.MISSING);
+
+			if (state.gps != null) {
+				mGPSLockedView.setText(AltosDroid.integer("%4d sats", state.gps.nsat));
+				mGPSLockedLights.set(state.gps.locked && state.gps.nsat >= 4, false);
+				if (state.gps_ready)
+					mGPSReadyView.setText("Ready");
+				else
+					mGPSReadyView.setText(AltosDroid.integer("Waiting %d", state.gps_waiting));
+			} else
+				mGPSLockedLights.set(false, true);
+			mGPSReadyLights.set(state.gps_ready, state.gps == null);
 		}
 
 		if (receiver != null) {
@@ -139,7 +142,7 @@ public class TabPad extends Fragment implements AltosDroidTab {
 				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));
+			mPadAltitudeView.setText(AltosDroid.number("%4.0f m", altitude));
 		}
 	}