projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Initialize SPI for easymini
[fw/altos]
/
altoslib
/
AltosRecordMM.java
diff --git
a/altoslib/AltosRecordMM.java
b/altoslib/AltosRecordMM.java
index 055cf85fb6e84a4a0d846a5763b91fe3fc0da882..bf64192c5888abe1a75e8050e72d2329db4fb154 100644
(file)
--- a/
altoslib/AltosRecordMM.java
+++ b/
altoslib/AltosRecordMM.java
@@
-15,10
+15,11
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.
AltosLib
;
+package org.altusmetrum.
altoslib_1
;
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,31
+46,27
@@
public class AltosRecordMM extends AltosRecord {
return raw / 4095.0;
}
return raw / 4095.0;
}
- public double
raw_
pressure() {
+ public double pressure() {
if (pres != MISSING)
if (pres != MISSING)
- return pres
/ 100.0
;
+ return pres;
return MISSING;
}
return MISSING;
}
- public double filtered_pressure() {
- return raw_pressure();
- }
-
public double ground_pressure() {
if (ground_pres != MISSING)
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 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 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;
}
return MISSING;
}
@@
-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);
@@
-141,10
+131,10
@@
public class AltosRecordMM extends AltosRecord {
mag = old.mag;
}
mag = old.mag;
}
+
+
public AltosRecordMM clone() {
public AltosRecordMM clone() {
- AltosRecordMM n = (AltosRecordMM) super.clone();
- n.copy(this);
- return n;
+ return new AltosRecordMM(this);
}
void make_missing() {
}
void make_missing() {
@@
-177,6
+167,10
@@
public class AltosRecordMM extends AltosRecord {
make_missing();
}
make_missing();
}
+ public AltosRecordMM(AltosRecordMM old) {
+ copy(old);
+ }
+
public AltosRecordMM() {
super();
make_missing();
public AltosRecordMM() {
super();
make_missing();