diff options
| author | Keith Packard <keithp@keithp.com> | 2014-06-10 11:30:36 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-06-10 11:30:36 -0700 |
| commit | 6fc58142d2a108c91d257eb0175098bf082834f9 (patch) | |
| tree | efc7491844e9df6c159454cd707e99cd6d0e9bbf /altosuilib/AltosGraph.java | |
| parent | 9d39bbd22e6cde1bbb39e7b5450f297d47365769 (diff) | |
altosuilib: Split battery graph enable out from other adc enables
This lets TeleGPS just show the battery voltage values without also
adding enable lines for the other flight computer ADC values like
ignitor voltages.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosuilib/AltosGraph.java')
| -rw-r--r-- | altosuilib/AltosGraph.java | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/altosuilib/AltosGraph.java b/altosuilib/AltosGraph.java index 73c53a22..f8c8b27b 100644 --- a/altosuilib/AltosGraph.java +++ b/altosuilib/AltosGraph.java @@ -333,19 +333,22 @@ public class AltosGraph extends AltosUIGraph { dbm_color, false, dbm_axis); - if (stats.has_other_adc) { - addSeries("Temperature", - AltosGraphDataPoint.data_temperature, - AltosConvert.temperature, - temperature_color, - false, - temperature_axis); + + if (stats.has_battery) addSeries("Battery Voltage", AltosGraphDataPoint.data_battery_voltage, voltage_units, battery_voltage_color, false, voltage_axis); + + if (stats.has_flight_adc) { + addSeries("Temperature", + AltosGraphDataPoint.data_temperature, + AltosConvert.temperature, + temperature_color, + false, + temperature_axis); addSeries("Drogue Voltage", AltosGraphDataPoint.data_drogue_voltage, voltage_units, |