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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
index 3c168e37..2d88974d 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_4.*;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -103,36 +103,39 @@ public class TabPad extends Fragment implements AltosDroidTab {
 
 	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);
+			mBatteryVoltageView.setText(AltosDroid.number("%4.2f V", state.battery_voltage));
+			mBatteryLights.set(state.battery_voltage >= AltosLib.ao_battery_good, state.battery_voltage == AltosLib.MISSING);
 
-			mApogeeVoltageView.setText(String.format("%4.2f V", state.drogue_sense));
-			mApogeeLights.set(state.drogue_sense > 3.2);
+			mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.apogee_voltage));
+			mApogeeLights.set(state.apogee_voltage >= AltosLib.ao_igniter_good, state.apogee_voltage == AltosLib.MISSING);
 
-			mMainVoltageView.setText(String.format("%4.2f V", state.main_sense));
-			mMainLights.set(state.main_sense > 3.2);
+			mMainVoltageView.setText(AltosDroid.number("%4.2f V", state.main_voltage));
+			mMainLights.set(state.main_voltage >= AltosLib.ao_igniter_good, state.main_voltage == AltosLib.MISSING);
 
-			if (state.data.flight != 0) {
-				if (state.data.state <= AltosLib.ao_flight_pad)
+			if (state.flight != 0) {
+				if (state.state <= AltosLib.ao_flight_pad)
 					mDataLoggingView.setText("Ready to record");
-				else if (state.data.state < AltosLib.ao_flight_landed)
+				else if (state.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);
+			mDataLoggingLights.set(state.flight != 0, state.flight == AltosLib.MISSING);
 
 			if (state.gps != null) {
-				mGPSLockedView.setText(String.format("%4d sats", state.gps.nsat));
-				mGPSLockedLights.set(state.gps.locked && state.gps.nsat >= 4);
+				int soln = state.gps.nsat;
+				int nsat = state.gps.cc_gps_sat != null ? state.gps.cc_gps_sat.length : 0;
+				mGPSLockedView.setText(String.format("%4d in soln, %4d in view", soln, nsat));
+				mGPSLockedLights.set(state.gps.locked && state.gps.nsat >= 4, false);
 				if (state.gps_ready)
 					mGPSReadyView.setText("Ready");
 				else
-					mGPSReadyView.setText(String.format("Waiting %d", state.gps_waiting));
-				mGPSReadyLights.set(state.gps_ready);
-			}
+					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) {
@@ -141,7 +144,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));
 		}
 	}