altoslib: fix computation of TeleGPS battery voltage

[fw/altos] / altoslib / AltosConvert.java

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index a3343a4f200aad0171696a31aaa88545c282b026..e1930430add0de07f49812808e053edfa5b0e38e 100644 (file)
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -19,11 +19,14 @@
 /*
  * Sensor data conversion functions
  */
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_13;
 
 import java.util.*;
 
 public class AltosConvert {
+
+       public static final double gravity = 9.80665;
+
        /*
         * Pressure Sensor Model, version 1.1
         *
@@ -44,20 +47,20 @@ public class AltosConvert {
         *   in Joules/(kilogram-Kelvin).
         */
 
-       public static final double GRAVITATIONAL_ACCELERATION = -9.80665;
-       public static final double AIR_GAS_CONSTANT             = 287.053;
-       public static final double NUMBER_OF_LAYERS             = 7;
-       public static final double MAXIMUM_ALTITUDE             = 84852.0;
-       public static final double MINIMUM_PRESSURE             = 0.3734;
-       public static final double LAYER0_BASE_TEMPERATURE      = 288.15;
-       public static final double LAYER0_BASE_PRESSURE = 101325;
+       private static final double GRAVITATIONAL_ACCELERATION = -gravity;
+       private static final double AIR_GAS_CONSTANT            = 287.053;
+       private static final double NUMBER_OF_LAYERS            = 7;
+       private static final double MAXIMUM_ALTITUDE            = 84852.0;
+       private static final double MINIMUM_PRESSURE            = 0.3734;
+       private static final double LAYER0_BASE_TEMPERATURE     = 288.15;
+       private static final double LAYER0_BASE_PRESSURE        = 101325;
 
        /* lapse rate and base altitude for each layer in the atmosphere */
-       public static final double[] lapse_rate = {
+       private static final double[] lapse_rate = {
                -0.0065, 0.0, 0.001, 0.0028, 0.0, -0.0028, -0.002
        };
 
-       public static final int[] base_altitude = {
+       private static final int[] base_altitude = {
                0, 11000, 20000, 32000, 47000, 51000, 71000
        };
 
@@ -181,6 +184,18 @@ public class AltosConvert {
                return altitude;
        }
 
+       public static double degrees_to_radians(double degrees) {
+               if (degrees == AltosLib.MISSING)
+                       return AltosLib.MISSING;
+               return degrees * (Math.PI / 180.0);
+       }
+
+       public static double radians_to_degrees(double radians) {
+               if (radians == AltosLib.MISSING)
+                       return AltosLib.MISSING;
+               return radians * (180.0 / Math.PI);
+       }
+
        public static double
        cc_battery_to_voltage(double battery)
        {
@@ -188,7 +203,7 @@ public class AltosConvert {
        }
 
        public static double
-       cc_ignitor_to_voltage(double ignite)
+       cc_igniter_to_voltage(double ignite)
        {
                return ignite / 32767 * 15.0;
        }
@@ -246,7 +261,7 @@ public class AltosConvert {
        static double tele_gps_voltage(int sensor) {
                double  supply = 3.3;
 
-               return sensor / 32767.0 * supply * (5.6 + 10.0) / 10.0;
+               return sensor / 4095.0 * supply * (5.6 + 10.0) / 10.0;
        }
 
        static double tele_bt_3_battery(int raw) {
@@ -255,7 +270,15 @@ public class AltosConvert {
                return 3.3 * mega_adc(raw) * (5.1 + 10.0) / 10.0;
        }
 
-       static double easy_mini_voltage(int sensor, int serial) {
+       static double easy_mini_2_adc(int raw) {
+               return raw / 4095.0;
+       }
+
+       static double easy_mini_1_adc(int raw) {
+               return raw / 32767.0;
+       }
+
+       static double easy_mini_1_voltage(int sensor, int serial) {
                double  supply = 3.3;
                double  diode_offset = 0.0;
 
@@ -269,7 +292,13 @@ public class AltosConvert {
                if (serial < 1665)
                        diode_offset = 0.150;
 
-               return sensor / 32767.0 * supply * 127/27 + diode_offset;
+               return easy_mini_1_adc(sensor) * supply * 127/27 + diode_offset;
+       }
+
+       static double easy_mini_2_voltage(int sensor) {
+               double  supply = 3.3;
+
+               return easy_mini_2_adc(sensor) * supply * 127/27;
        }
 
        public static double radio_to_frequency(int freq, int setting, int cal, int channel) {
@@ -307,6 +336,10 @@ public class AltosConvert {
                return 434.550 + channel * 0.100;
        }
 
+       public static int telem_to_rssi(int telem) {
+               return telem / 2 - 74;
+       }
+
        public static int[] ParseHex(String line) {
                String[] tokens = line.split("\\s+");
                int[] array = new int[tokens.length];
@@ -384,6 +417,26 @@ public class AltosConvert {
                return lb / 0.22480894;
        }
 
+       public static double acceleration_from_sensor(double sensor, double plus_g, double minus_g, double ground) {
+
+               if (sensor == AltosLib.MISSING)
+                       return AltosLib.MISSING;
+
+               if (plus_g == AltosLib.MISSING || minus_g == AltosLib.MISSING)
+                       return AltosLib.MISSING;
+
+               if (ground == AltosLib.MISSING)
+                       ground = plus_g;
+
+               double counts_per_g = (plus_g - minus_g) / 2.0;
+               double counts_per_mss = counts_per_g / gravity;
+
+               if (counts_per_mss == 0)
+                       return AltosLib.MISSING;
+
+               return (sensor - ground) / counts_per_mss;
+       }
+
        public static boolean imperial_units = false;
 
        public static AltosDistance distance = new AltosDistance();
@@ -410,6 +463,12 @@ public class AltosConvert {
 
        public static AltosRotationRate rotation_rate = new AltosRotationRate();
 
+       public static AltosStateName state_name = new AltosStateName();
+
+       public static AltosPyroName pyro_name = new AltosPyroName();
+
+       public static AltosUnits magnetic_field = null;
+
        public static String show_gs(String format, double a) {
                a = meters_to_g(a);
                format = format.concat(" g");