X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosRecordMM.java;h=9f5292346a61e773aee88f2aa22e290fda86590f;hb=fcb801b145e1ae6f1c0b3418a99245d34dbf5aa4;hp=5f952f7a96a1b8aa02543076de90638f3e8cb860;hpb=99b7eaf8d1b312443b842d078fb8464032b3a39b;p=fw%2Faltos diff --git a/altoslib/AltosRecordMM.java b/altoslib/AltosRecordMM.java index 5f952f7a..9f529234 100644 --- a/altoslib/AltosRecordMM.java +++ b/altoslib/AltosRecordMM.java @@ -19,6 +19,7 @@ package org.altusmetrum.AltosLib; public class AltosRecordMM extends AltosRecord { + /* Sensor values */ public int accel; public int pres; public int temp; @@ -45,16 +46,12 @@ public class AltosRecordMM extends AltosRecord { return raw / 4095.0; } - public double raw_pressure() { + public double pressure() { if (pres != MISSING) return pres; return MISSING; } - public double filtered_pressure() { - return raw_pressure(); - } - public double ground_pressure() { if (ground_pres != MISSING) return ground_pres; @@ -98,9 +95,6 @@ public class AltosRecordMM extends AltosRecord { } public double acceleration() { - if (acceleration != MISSING) - return acceleration; - if (ground_accel == MISSING || accel == MISSING) return MISSING; @@ -110,10 +104,6 @@ public class AltosRecordMM extends AltosRecord { return (ground_accel - accel) / accel_counts_per_mss(); } - public double accel_speed() { - return speed; - } - public void copy (AltosRecordMM old) { super.copy(old);