projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into new-state
[fw/altos]
/
altoslib
/
AltosConvert.java
diff --git
a/altoslib/AltosConvert.java
b/altoslib/AltosConvert.java
index acd6c5f481f331bcdd28fa4304668996e3db04c1..a1e2cdcab7715293f08707b92cd03548294909db 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
;
+package org.altusmetrum.
altoslib_1
;
public class AltosConvert {
/*
public class AltosConvert {
/*
@@
-190,6
+190,12
@@
public class AltosConvert {
return ignite / 32767 * 15.0;
}
return ignite / 32767 * 15.0;
}
+ public static double
+ barometer_to_pressure(double count)
+ {
+ return ((count / 16.0) / 2047.0 + 0.095) / 0.009 * 1000.0;
+ }
+
public static double radio_to_frequency(int freq, int setting, int cal, int channel) {
double f;
public static double radio_to_frequency(int freq, int setting, int cal, int channel) {
double f;
@@
-242,6
+248,10
@@
public class AltosConvert {
return meters * (100 / (2.54 * 12));
}
return meters * (100 / (2.54 * 12));
}
+ public static double feet_to_meters(double feet) {
+ return feet * 12 * 2.54 / 100.0;
+ }
+
public static double meters_to_miles(double meters) {
return meters_to_feet(meters) / 5280;
}
public static double meters_to_miles(double meters) {
return meters_to_feet(meters) / 5280;
}
@@
-258,6
+268,10
@@
public class AltosConvert {
return meters / 9.80665;
}
return meters / 9.80665;
}
+ public static double c_to_f(double c) {
+ return c * 9/5 + 32;
+ }
+
public static boolean imperial_units = false;
public static AltosDistance distance = new AltosDistance();
public static boolean imperial_units = false;
public static AltosDistance distance = new AltosDistance();
@@
-268,6
+282,8
@@
public class AltosConvert {
public static AltosAccel accel = new AltosAccel();
public static AltosAccel accel = new AltosAccel();
+ public static AltosTemperature temperature = new AltosTemperature();
+
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");