Merge branch 'master' into new-state

[fw/altos] / altoslib / AltosConvert.java

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index a42b36c46fc5debdb669ea17f7dd5f88ef379e6f..a1e2cdcab7715293f08707b92cd03548294909db 100644 (file)
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -190,6 +190,12 @@ public class AltosConvert {
                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;
 
@@ -242,6 +248,10 @@ public class AltosConvert {
                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;
        }