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 066c1353ef792a87896a18a3522d9623725a0e2d..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_
1
.*;
+import org.altusmetrum.altoslib_
4
.*;
import android.app.Activity;
import android.os.Bundle;
import android.app.Activity;
import android.os.Bundle;
@@
-103,29
+103,31
@@
public class TabPad extends Fragment implements AltosDroidTab {
public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
if (state != null) {
public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
if (state != null) {
- mBatteryVoltageView.setText(AltosDroid.number("%4.2f V", state.battery));
- mBatteryLights.set(state.battery
> 3.7, state.battery == AltosRecord
.MISSING);
+ 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(AltosDroid.number("%4.2f V", state.
drogue_sens
e));
- mApogeeLights.set(state.
drogue_sense > 3.2, state.drogue_sense == AltosRecord
.MISSING);
+ mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.
apogee_voltag
e));
+ mApogeeLights.set(state.
apogee_voltage >= AltosLib.ao_igniter_good, state.apogee_voltage == AltosLib
.MISSING);
- mMainVoltageView.setText(AltosDroid.number("%4.2f V", state.main_
sens
e));
- mMainLights.set(state.main_
sense > 3.2, state.main_sense == AltosRecord
.MISSING);
+ mMainVoltageView.setText(AltosDroid.number("%4.2f V", state.main_
voltag
e));
+ 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");
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");
}
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);
+ mDataLoggingLights.set(state.
flight != 0, state.flight == AltosLib
.MISSING);
if (state.gps != null) {
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");