projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Don't try to drag lines around until map is loaded
[fw/altos]
/
altoslib
/
AltosConvert.java
diff --git
a/altoslib/AltosConvert.java
b/altoslib/AltosConvert.java
index 25bbf7a0c7709af62752f95685580a7b66f6a0f6..265b5f0f633e26a544203d83b188a52971166468 100644
(file)
--- a/
altoslib/AltosConvert.java
+++ b/
altoslib/AltosConvert.java
@@
-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 */
}