Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altoslib / AltosRecordMM.java

diff --git a/altoslib/AltosRecordMM.java b/altoslib/AltosRecordMM.java
index 8b3d745a8341d5e1f15e6eaf57b5a20301f55351..546f305537ef162909883f427ae12629c7f8fa94 100644 (file)
--- 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,31 +46,27 @@ public class AltosRecordMM extends AltosRecord {
                return raw / 4095.0;
        }
 
-       public double raw_pressure() {
+       public double pressure() {
                if (pres != MISSING)
-                       return pres / 100.0;
+                       return pres;
                return MISSING;
        }
 
-       public double filtered_pressure() {
-               return raw_pressure();
-       }
-
        public double ground_pressure() {
                if (ground_pres != MISSING)
-                       return ground_pres / 100.0;
+                       return ground_pres;
                return MISSING;
        }
 
        public double battery_voltage() {
                if (v_batt != MISSING)
-                       return 3.3 * adc(v_batt) * 27.0 / (15.0 + 27.0);
+                       return 3.3 * adc(v_batt) * (15.0 + 27.0) / 27.0;
                return MISSING;
        }
 
        static double pyro(int raw) {
                if (raw != MISSING)
-                       return 3.3 * adc(raw) * 27.0 / (100.0 + 27.0);
+                       return 3.3 * adc(raw) * (100.0 + 27.0) / 27.0;
                return MISSING;
        }
 
@@ -98,11 +95,6 @@ public class AltosRecordMM extends AltosRecord {
        }
 
        public double acceleration() {
-               System.out.printf("MM record acceleration %g ground_accel %d accel %d accel_minus_g %d accel_plus_g %d\n",
-                                 acceleration, ground_accel, accel, accel_minus_g, accel_plus_g);
-               if (acceleration != MISSING)
-                       return acceleration;
-
                if (ground_accel == MISSING || accel == MISSING)
                        return MISSING;
 
@@ -112,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);
 
@@ -143,10 +131,10 @@ public class AltosRecordMM extends AltosRecord {
                mag = old.mag;
        }
 
+
+
        public AltosRecordMM clone() {
-               AltosRecordMM n = (AltosRecordMM) super.clone();
-               n.copy(this);
-               return n;
+               return new AltosRecordMM(this);
        }
 
        void make_missing() {
@@ -179,6 +167,10 @@ public class AltosRecordMM extends AltosRecord {
                make_missing();
        }
 
+       public AltosRecordMM(AltosRecordMM old) {
+               copy(old);
+       }
+
        public AltosRecordMM() {
                super();
                make_missing();