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>
/* Bluetooth "identifier" (bluetooth sucks) */
public final static String bt_product_telebt = "TeleBT";
/* 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;
/* Telemetry modes */
public static final int ao_telemetry_off = 0;
public static final int ao_telemetry_min = 1;
class Apogee extends AscentStatus {
void show (AltosState state, AltosListenerState listener_state) {
show("%4.2f V", state.apogee_voltage);
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");
}
public Apogee (GridBagLayout layout, int y) {
super(layout, y, "Apogee Igniter Voltage");
class Main extends AscentStatus {
void show (AltosState state, AltosListenerState listener_state) {
show("%4.2f V", state.main_voltage);
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");
}
public Main (GridBagLayout layout, int y) {
super(layout, y, "Main Igniter Voltage");
class Apogee extends DescentStatus {
void show (AltosState state, AltosListenerState listener_state) {
show("%4.2f V", state.apogee_voltage);
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");
}
public Apogee (GridBagLayout layout, int y) {
super(layout, y, "Apogee Igniter Voltage");
class Main extends DescentStatus {
void show (AltosState state, AltosListenerState listener_state) {
show("%4.2f V", state.main_voltage);
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");
}
public Main (GridBagLayout layout, int y) {
super(layout, y, "Main Igniter Voltage");
hide();
else {
show("%4.2f V", state.battery_voltage);
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) {
}
}
public Battery (GridBagLayout layout, int y) {
hide();
else {
show("%4.2f V", state.apogee_voltage);
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) {
}
}
public Apogee (GridBagLayout layout, int y) {
hide();
else {
show("%4.2f V", state.main_voltage);
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) {
}
}
public Main (GridBagLayout layout, int y) {
hide();
else {
show("%4.2f V", listener_state.battery);
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) {
}
}
public ReceiverBattery (GridBagLayout layout, int y) {