projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Reduce printf calls in APRS packet generation
[fw/altos]
/
altoslib
/
AltosRecordTM.java
diff --git
a/altoslib/AltosRecordTM.java
b/altoslib/AltosRecordTM.java
index afb7079097fd05359fe8d998f4ca8fdf46515ee4..9530be31fc4f26579cfb672654a6551b1b08d2bf 100644
(file)
--- a/
altoslib/AltosRecordTM.java
+++ b/
altoslib/AltosRecordTM.java
@@
-18,6
+18,8
@@
package org.altusmetrum.AltosLib;
public class AltosRecordTM extends AltosRecord {
package org.altusmetrum.AltosLib;
public class AltosRecordTM extends AltosRecord {
+
+ /* Sensor values */
public int accel;
public int pres;
public int temp;
public int accel;
public int pres;
public int temp;
@@
-57,18
+59,12
@@
public class AltosRecordTM extends AltosRecord {
return ((count / 16.0) / 2047.0 + 0.095) / 0.009 * 1000.0;
}
return ((count / 16.0) / 2047.0 + 0.095) / 0.009 * 1000.0;
}
- public double
raw_
pressure() {
+ public double pressure() {
if (pres == MISSING)
return MISSING;
return barometer_to_pressure(pres);
}
if (pres == MISSING)
return MISSING;
return barometer_to_pressure(pres);
}
- public double filtered_pressure() {
- if (flight_pres == MISSING)
- return MISSING;
- return barometer_to_pressure(flight_pres);
- }
-
public double ground_pressure() {
if (ground_pres == MISSING)
return MISSING;
public double ground_pressure() {
if (ground_pres == MISSING)
return MISSING;
@@
-121,22
+117,11
@@
public class AltosRecordTM extends AltosRecord {
}
public double acceleration() {
}
public double acceleration() {
- if (acceleration != MISSING)
- return acceleration;
-
if (ground_accel == MISSING || accel == MISSING)
return MISSING;
return (ground_accel - accel) / accel_counts_per_mss();
}
if (ground_accel == MISSING || accel == MISSING)
return MISSING;
return (ground_accel - accel) / accel_counts_per_mss();
}
- public double accel_speed() {
- if (speed != MISSING)
- return speed;
- if (flight_vel == MISSING)
- return MISSING;
- return flight_vel / (accel_counts_per_mss() * 100.0);
- }
-
public void copy(AltosRecordTM old) {
super.copy(old);
public void copy(AltosRecordTM old) {
super.copy(old);
@@
-177,14
+162,14
@@
public class AltosRecordTM extends AltosRecord {
drogue = MISSING;
main = MISSING;
drogue = MISSING;
main = MISSING;
- flight_accel =
0
;
- flight_vel =
0
;
- flight_pres =
0
;
+ flight_accel =
MISSING
;
+ flight_vel =
MISSING
;
+ flight_pres =
MISSING
;
- ground_accel =
0
;
- ground_pres =
0
;
- accel_plus_g =
0
;
- accel_minus_g =
0
;
+ ground_accel =
MISSING
;
+ ground_pres =
MISSING
;
+ accel_plus_g =
MISSING
;
+ accel_minus_g =
MISSING
;
}
public AltosRecordTM(AltosRecord old) {
}
public AltosRecordTM(AltosRecord old) {