X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTabPad.java;h=175a41de107ef5abd4716f3622a1c157e1d17ff9;hb=bd440afc2a6e37b74fffcf1b977e149485095316;hp=10bb3bd9c0eae7c57dcb2269145973dfff796d2f;hpb=f0216d721ed13f4d3dc608bb6ad8f83732b27c0a;p=fw%2Faltos diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java index 10bb3bd9..175a41de 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_4.*; +import org.altusmetrum.altoslib_5.*; import android.app.Activity; import android.os.Bundle; @@ -125,7 +125,9 @@ public class TabPad extends Fragment implements AltosDroidTab { mDataLoggingLights.set(state.flight != 0, state.flight == AltosLib.MISSING); if (state.gps != null) { - mGPSLockedView.setText(AltosDroid.integer("%4d sats", state.gps.nsat)); + 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");