altoslib/altosui: Further AltosState transition work

[fw/altos] / altoslib / AltosConvert.java

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 6345e522fbed9d1eb8d189804b391b0ffb2d91a8..cf2bc59f35482a89a5df10311a0c48f821579ea1 100644 (file)
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -18,7 +18,7 @@
 /*
  * Sensor data conversion functions
  */
-package org.altusmetrum.altoslib;
+package org.altusmetrum.altoslib_1;
 
 public class AltosConvert {
        /*
@@ -190,6 +190,34 @@ 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;
+       }
+
+       static double
+       thermometer_to_temperature(double thermo)
+       {
+               return (thermo - 19791.268) / 32728.0 * 1.25 / 0.00247;
+       }
+
+       static double mega_adc(int raw) {
+               return raw / 4095.0;
+       }
+
+       static public double mega_battery_voltage(int v_batt) {
+               if (v_batt != AltosRecord.MISSING)
+                       return 3.3 * mega_adc(v_batt) * (15.0 + 27.0) / 27.0;
+               return AltosRecord.MISSING;
+       }
+
+       static double mega_pyro_voltage(int raw) {
+               if (raw != AltosRecord.MISSING)
+                       return 3.3 * mega_adc(raw) * (100.0 + 27.0) / 27.0;
+               return AltosRecord.MISSING;
+       }
+
        public static double radio_to_frequency(int freq, int setting, int cal, int channel) {
                double  f;
 
@@ -242,6 +270,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;
        }
@@ -258,6 +290,10 @@ public class AltosConvert {
                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();
@@ -268,6 +304,8 @@ public class AltosConvert {
 
        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");