* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_1;
public class AltosRecordMM extends AltosRecord {
+ /* Sensor values */
public int accel;
public int pres;
public int temp;
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;
}
}
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;
return (ground_accel - accel) / accel_counts_per_mss();
}
- public double accel_speed() {
- return speed;
- }
-
public void copy (AltosRecordMM old) {
super.copy(old);
mag = old.mag;
}
+
+
public AltosRecordMM clone() {
- AltosRecordMM n = (AltosRecordMM) super.clone();
- n.copy(this);
- return n;
+ return new AltosRecordMM(this);
}
void make_missing() {
make_missing();
}
+ public AltosRecordMM(AltosRecordMM old) {
+ copy(old);
+ }
+
public AltosRecordMM() {
super();
make_missing();