projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui/altoslib: add methods to interface, fix imports/exceptions in BT code
[fw/altos]
/
altoslib
/
AltosRecordMM.java
diff --git
a/altoslib/AltosRecordMM.java
b/altoslib/AltosRecordMM.java
index 8b3d745a8341d5e1f15e6eaf57b5a20301f55351..5f952f7a96a1b8aa02543076de90638f3e8cb860 100644
(file)
--- a/
altoslib/AltosRecordMM.java
+++ b/
altoslib/AltosRecordMM.java
@@
-47,7
+47,7
@@
public class AltosRecordMM extends AltosRecord {
public double raw_pressure() {
if (pres != MISSING)
public double raw_pressure() {
if (pres != MISSING)
- return pres
/ 100.0
;
+ return pres;
return MISSING;
}
return MISSING;
}
@@
-57,19
+57,19
@@
public class AltosRecordMM extends AltosRecord {
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,8
+98,6
@@
public class AltosRecordMM extends AltosRecord {
}
public double acceleration() {
}
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 (acceleration != MISSING)
return acceleration;