altosui: Add configuration UI for beeper tone

[fw/altos] / altoslib / AltosConvert.java

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 8cd478e2bd5ff6820bc0e5432deb1d8ad70a4082..4ed45c6869a045c0b7df6025fd9cd1daa36751e6 100644 (file)
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -18,7 +18,7 @@
 /*
  * Sensor data conversion functions
  */
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_3;
 
 public class AltosConvert {
        /*
@@ -190,6 +190,57 @@ 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 != AltosLib.MISSING)
+                       return 3.3 * mega_adc(v_batt) * (15.0 + 27.0) / 27.0;
+               return AltosLib.MISSING;
+       }
+
+       static double mega_pyro_voltage(int raw) {
+               if (raw != AltosLib.MISSING)
+                       return 3.3 * mega_adc(raw) * (100.0 + 27.0) / 27.0;
+               return AltosLib.MISSING;
+       }
+
+       static double tele_mini_voltage(int sensor) {
+               double  supply = 3.3;
+
+               return sensor / 32767.0 * supply * 127/27;
+       }
+
+       static double easy_mini_voltage(int sensor, int serial) {
+               double  supply = 3.3;
+               double  diode_offset = 0.0;
+
+               /* early prototypes had a 3.0V regulator */
+               if (serial < 1000)
+                       supply = 3.0;
+
+               /* Purple v1.0 boards had the sensor after the
+                * blocking diode, which drops about 150mV
+                */
+               if (serial < 1665)
+                       diode_offset = 0.150;
+
+               return sensor / 32767.0 * supply * 127/27 + diode_offset;
+       }
+
        public static double radio_to_frequency(int freq, int setting, int cal, int channel) {
                double  f;
 
@@ -250,10 +301,18 @@ public class AltosConvert {
                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 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 */
        }
@@ -266,6 +325,10 @@ public class AltosConvert {
                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();
@@ -278,6 +341,8 @@ public class AltosConvert {
 
        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");
@@ -294,4 +359,16 @@ public class AltosConvert {
                        csum += data[i + start];
                return csum & 0xff;
        }
+
+       public static double beep_value_to_freq(int value) {
+               if (value == 0)
+                       return 4000;
+               return 1.0/2.0 * (24.0e6/32.0) / (double) value;
+       }
+
+       public static int beep_freq_to_value(double freq) {
+               if (freq == 0)
+                       return 94;
+               return (int) Math.floor (1.0/2.0 * (24.0e6/32.0) / freq + 0.5);
+       }
 }