projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Call config UI from AltosConfigData directly
[fw/altos]
/
altoslib
/
AltosRecordMM.java
diff --git
a/altoslib/AltosRecordMM.java
b/altoslib/AltosRecordMM.java
index 5f952f7a96a1b8aa02543076de90638f3e8cb860..9f5292346a61e773aee88f2aa22e290fda86590f 100644
(file)
--- a/
altoslib/AltosRecordMM.java
+++ b/
altoslib/AltosRecordMM.java
@@
-19,6
+19,7
@@
package org.altusmetrum.AltosLib;
public class AltosRecordMM extends AltosRecord {
public class AltosRecordMM extends AltosRecord {
+ /* Sensor values */
public int accel;
public int pres;
public int temp;
public int accel;
public int pres;
public int temp;
@@
-45,16
+46,12
@@
public class AltosRecordMM extends AltosRecord {
return raw / 4095.0;
}
return raw / 4095.0;
}
- public double
raw_
pressure() {
+ public double pressure() {
if (pres != MISSING)
return pres;
return MISSING;
}
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;
public double ground_pressure() {
if (ground_pres != MISSING)
return ground_pres;
@@
-98,9
+95,6
@@
public class AltosRecordMM extends AltosRecord {
}
public double acceleration() {
}
public double acceleration() {
- if (acceleration != MISSING)
- return acceleration;
-
if (ground_accel == MISSING || accel == MISSING)
return MISSING;
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();
}
return (ground_accel - accel) / accel_counts_per_mss();
}
- public double accel_speed() {
- return speed;
- }
-
public void copy (AltosRecordMM old) {
super.copy(old);
public void copy (AltosRecordMM old) {
super.copy(old);