projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
micropeak: Construct linux install script
[fw/altos]
/
altoslib
/
AltosConvert.java
diff --git
a/altoslib/AltosConvert.java
b/altoslib/AltosConvert.java
index 760d9eb98c273a0501f15aad1e09b4dc6a6dca67..8f214c8b40c7a80fc6778a3b6806e471b76b7ad6 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_
2
;
+package org.altusmetrum.altoslib_
3
;
public class AltosConvert {
/*
public class AltosConvert {
/*
@@
-290,10
+290,18
@@
public class AltosConvert {
return meters_to_feet(meters) / 5280;
}
return meters_to_feet(meters) / 5280;
}
+ public static double miles_to_meters(double miles) {
+ return feet_to_meters(miles * 5280);
+ }
+
public static double meters_to_mph(double mps) {
return meters_to_miles(mps) * 3600;
}
public static double meters_to_mph(double mps) {
return meters_to_miles(mps) * 3600;
}
+ public static double mph_to_meters(double mps) {
+ return miles_to_meters(mps) / 3600;
+ }
+
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 */
}
@@
-306,6
+314,10
@@
public class AltosConvert {
return c * 9/5 + 32;
}
return c * 9/5 + 32;
}
+ public static double f_to_c(double c) {
+ return (c - 32) * 5/9;
+ }
+
public static boolean imperial_units = false;
public static AltosDistance distance = new AltosDistance();
public static boolean imperial_units = false;
public static AltosDistance distance = new AltosDistance();
@@
-318,6
+330,8
@@
public class AltosConvert {
public static AltosTemperature temperature = new AltosTemperature();
public static AltosTemperature temperature = new AltosTemperature();
+ public static AltosOrient orient = new AltosOrient();
+
public static String show_gs(String format, double a) {
a = meters_to_g(a);
format = format.concat(" g");
public static String show_gs(String format, double a) {
a = meters_to_g(a);
format = format.concat(" g");