projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosdroid: Improve voice for TeleGPS
[fw/altos]
/
altosdroid
/
src
/
org
/
altusmetrum
/
AltosDroid
/
TabPad.java
diff --git
a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
index b9e878f12519be8ac4ecf2325fe668db3e1a7f6e..2d88974d3d787f516c15ea352b6e3936a5cfae84 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
@@
-17,7
+17,7
@@
package org.altusmetrum.AltosDroid;
package org.altusmetrum.AltosDroid;
-import org.altusmetrum.altoslib_
2
.*;
+import org.altusmetrum.altoslib_
4
.*;
import android.app.Activity;
import android.os.Bundle;
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) {
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");
mGPSLockedLights.set(state.gps.locked && state.gps.nsat >= 4, false);
if (state.gps_ready)
mGPSReadyView.setText("Ready");