From: Keith Packard <keithp@keithp.com>
Date: Wed, 18 Dec 2013 21:22:45 +0000 (-0800)
Subject: altoslib: Define 3.8 as a good battery and 3.5 as a good igniter
X-Git-Tag: 1.3~13^2~6
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=dbcf3264f950c4e1d450828c9f161b4c418bee97

altoslib: Define 3.8 as a good battery and 3.5 as a good igniter

Use defined values everywhere instead of copying. Adjust battery up to
3.8 to ensure there's enough voltage to not trip the comparators

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

diff --git a/altoslib/AltosLib.java b/altoslib/AltosLib.java
index 36a2ab32..efbc3ddb 100644
--- a/altoslib/AltosLib.java
+++ b/altoslib/AltosLib.java
@@ -143,6 +143,11 @@ public class AltosLib {
 	/* Bluetooth "identifier" (bluetooth sucks) */
 	public final static String bt_product_telebt = "TeleBT";
 
+	/* "good" voltages */
+
+	public final static double ao_battery_good = 3.8;
+	public final static double ao_igniter_good = 3.5;
+
 	/* Telemetry modes */
 	public static final int ao_telemetry_off = 0;
 	public static final int ao_telemetry_min = 1;
diff --git a/altosui/AltosAscent.java b/altosui/AltosAscent.java
index 1d9af546..ba4fc614 100644
--- a/altosui/AltosAscent.java
+++ b/altosui/AltosAscent.java
@@ -285,7 +285,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	class Apogee extends AscentStatus {
 		void show (AltosState state, AltosListenerState listener_state) {
 			show("%4.2f V", state.apogee_voltage);
-			lights.set(state.apogee_voltage > 3.7);
+ 			lights.set(state.apogee_voltage >= AltosLib.ao_igniter_good);
 		}
 		public Apogee (GridBagLayout layout, int y) {
 			super(layout, y, "Apogee Igniter Voltage");
@@ -297,7 +297,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 	class Main extends AscentStatus {
 		void show (AltosState state, AltosListenerState listener_state) {
 			show("%4.2f V", state.main_voltage);
-			lights.set(state.main_voltage > 3.7);
+			lights.set(state.main_voltage >= AltosLib.ao_igniter_good);
 		}
 		public Main (GridBagLayout layout, int y) {
 			super(layout, y, "Main Igniter Voltage");
diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index 77776ff2..e73d990c 100644
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.java
@@ -323,7 +323,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	class Apogee extends DescentStatus {
 		void show (AltosState state, AltosListenerState listener_state) {
 			show("%4.2f V", state.apogee_voltage);
-			lights.set(state.apogee_voltage > 3.7);
+			lights.set(state.apogee_voltage >= AltosLib.ao_igniter_good);
 		}
 		public Apogee (GridBagLayout layout, int y) {
 			super(layout, y, "Apogee Igniter Voltage");
@@ -335,7 +335,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 	class Main extends DescentStatus {
 		void show (AltosState state, AltosListenerState listener_state) {
 			show("%4.2f V", state.main_voltage);
-			lights.set(state.main_voltage > 3.7);
+			lights.set(state.main_voltage >= AltosLib.ao_igniter_good);
 		}
 		public Main (GridBagLayout layout, int y) {
 			super(layout, y, "Main Igniter Voltage");
diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index b35bd23a..06a0f1ef 100644
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -180,7 +180,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 				hide();
 			else {
 				show("%4.2f V", state.battery_voltage);
-				lights.set(state.battery_voltage > 3.7);
+				lights.set(state.battery_voltage >= AltosLib.ao_battery_good);
 			}
 		}
 		public Battery (GridBagLayout layout, int y) {
@@ -196,7 +196,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 				hide();
 			else {
 				show("%4.2f V", state.apogee_voltage);
-				lights.set(state.apogee_voltage > 3.7);
+				lights.set(state.apogee_voltage >= AltosLib.ao_igniter_good);
 			}
 		}
 		public Apogee (GridBagLayout layout, int y) {
@@ -212,7 +212,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 				hide();
 			else {
 				show("%4.2f V", state.main_voltage);
-				lights.set(state.main_voltage > 3.7);
+				lights.set(state.main_voltage >= AltosLib.ao_igniter_good);
 			}
 		}
 		public Main (GridBagLayout layout, int y) {
@@ -287,7 +287,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 				hide();
 			else {
 				show("%4.2f V", listener_state.battery);
-				lights.set(listener_state.battery > 3.7);
+				lights.set(listener_state.battery > AltosLib.ao_battery_good);
 			}
 		}
 		public ReceiverBattery (GridBagLayout layout, int y) {