X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosRecord.java;h=18c6079d01d84ea245c78a55b8f2e2bf28553ced;hb=34ca8c00f4be72c314baff4c96f1e2f010948454;hp=b670ee371abed05de27cfd835642b16591a00adc;hpb=f317f1324b69b4241f4bb192e164b33d712d5a43;p=fw%2Faltos diff --git a/ao-tools/altosui/AltosRecord.java b/ao-tools/altosui/AltosRecord.java index b670ee37..18c6079d 100644 --- a/ao-tools/altosui/AltosRecord.java +++ b/ao-tools/altosui/AltosRecord.java @@ -73,7 +73,11 @@ public class AltosRecord { return ((count / 16.0) / 2047.0 + 0.095) / 0.009 * 1000.0; } - public double pressure() { + public double raw_pressure() { + return barometer_to_pressure(pres); + } + + public double filtered_pressure() { return barometer_to_pressure(flight_pres); } @@ -81,16 +85,24 @@ public class AltosRecord { return barometer_to_pressure(ground_pres); } - public double altitude() { - return AltosConvert.pressure_to_altitude(pressure()); + public double filtered_altitude() { + return AltosConvert.pressure_to_altitude(filtered_pressure()); + } + + public double raw_altitude() { + return AltosConvert.pressure_to_altitude(raw_pressure()); } public double ground_altitude() { return AltosConvert.pressure_to_altitude(ground_pressure()); } - public double height() { - return altitude() - ground_altitude(); + public double filtered_height() { + return filtered_altitude() - ground_altitude(); + } + + public double raw_height() { + return raw_altitude() - ground_altitude(); } public double battery_voltage() {