altoslib: Add TeleFireTwo eeprom support

[fw/altos] / altoslib / AltosConvert.java

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 3e0f0e1ac99170caa03b1a626575fd936bae1873..8617a12cea7a5def8d7062cde0f3aea11e4561d6 100644 (file)
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,7 +19,7 @@
 /*
  * Sensor data conversion functions
  */
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_11;
 
 public class AltosConvert {
        /*
@@ -218,7 +219,23 @@ public class AltosConvert {
                return AltosLib.MISSING;
        }
 
-       static double tele_mini_voltage(int sensor) {
+       static double tele_mini_3_adc(int raw) {
+               return raw / 4095.0;
+       }
+
+       static public double tele_mini_3_battery_voltage(int v_batt) {
+               if (v_batt != AltosLib.MISSING)
+                       return 3.3 * tele_mini_3_adc(v_batt) * (5.6 + 10.0) / 10.0;
+               return AltosLib.MISSING;
+       }
+
+       static double tele_mini_3_pyro_voltage(int raw) {
+               if (raw != AltosLib.MISSING)
+                       return 3.3 * tele_mini_3_adc(raw) * (100.0 + 27.0) / 27.0;
+               return AltosLib.MISSING;
+       }
+
+       static double tele_mini_2_voltage(int sensor) {
                double  supply = 3.3;
 
                return sensor / 32767.0 * supply * 127/27;
@@ -325,6 +342,14 @@ public class AltosConvert {
                return miles_to_meters(mps) / 3600;
        }
 
+       public static double mps_to_fps(double mps) {
+               return meters_to_miles(mps) * 5280;
+       }
+
+       public static double fps_to_mps(double mps) {
+               return miles_to_meters(mps) / 5280;
+       }
+
        public static double meters_to_mach(double meters) {
                return meters / 343;            /* something close to mach at usual rocket sites */
        }
@@ -341,6 +366,10 @@ public class AltosConvert {
                return (c - 32) * 5/9;
        }
 
+       public static double psi_to_pa(double psi) {
+               return psi * 6894.76;
+       }
+
        public static boolean imperial_units = false;
 
        public static AltosDistance distance = new AltosDistance();