From: Keith Packard <keithp@keithp.com>
Date: Wed, 18 Dec 2013 21:25:31 +0000 (-0800)
Subject: altosdroid: Use altoslib standard voltages to control lights
X-Git-Tag: 1.3~13^2~5
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=58ceb9c845d51547244538fe6beec27e9a232af8

altosdroid: Use altoslib standard voltages to control lights

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
index 2c6732e5..b9e878f1 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
@@ -104,13 +104,13 @@ public class TabPad extends Fragment implements AltosDroidTab {
 	public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (state != null) {
 			mBatteryVoltageView.setText(AltosDroid.number("%4.2f V", state.battery_voltage));
-			mBatteryLights.set(state.battery_voltage > 3.7, state.battery_voltage == AltosLib.MISSING);
+			mBatteryLights.set(state.battery_voltage >= AltosLib.ao_battery_good, state.battery_voltage == AltosLib.MISSING);
 
 			mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.apogee_voltage));
-			mApogeeLights.set(state.apogee_voltage > 3.2, state.apogee_voltage == AltosLib.MISSING);
+			mApogeeLights.set(state.apogee_voltage >= AltosLib.ao_igniter_good, state.apogee_voltage == AltosLib.MISSING);
 
 			mMainVoltageView.setText(AltosDroid.number("%4.2f V", state.main_voltage));
-			mMainLights.set(state.main_voltage > 3.2, state.main_voltage == AltosLib.MISSING);
+			mMainLights.set(state.main_voltage >= AltosLib.ao_igniter_good, state.main_voltage == AltosLib.MISSING);
 
 			if (state.flight != 0) {
 				if (state.state <= AltosLib.ao_flight_pad)