projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui/telegps/micropeak: Handle both MULTI_LIB and non-MULTI_LIB builds
[fw/altos]
/
altoslib
/
AltosConvert.java
diff --git
a/altoslib/AltosConvert.java
b/altoslib/AltosConvert.java
index 25bbf7a0c7709af62752f95685580a7b66f6a0f6..5498ae98cb855f66d42cd858bf275a71ad830b08 100644
(file)
--- a/
altoslib/AltosConvert.java
+++ b/
altoslib/AltosConvert.java
@@
-18,7
+18,7
@@
/*
* Sensor data conversion functions
*/
/*
* Sensor data conversion functions
*/
-package org.altusmetrum.altoslib_1
0
;
+package org.altusmetrum.altoslib_1
1
;
public class AltosConvert {
/*
public class AltosConvert {
/*
@@
-325,6
+325,14
@@
public class AltosConvert {
return miles_to_meters(mps) / 3600;
}
return miles_to_meters(mps) / 3600;
}
+ public static double mps_to_fps(double mps) {
+ return meters_to_miles(mps) * 5280;
+ }
+
+ public static double fps_to_mps(double mps) {
+ return miles_to_meters(mps) / 5280;
+ }
+
public static double meters_to_mach(double meters) {
return meters / 343; /* something close to mach at usual rocket sites */
}
public static double meters_to_mach(double meters) {
return meters / 343; /* something close to mach at usual rocket sites */
}