Switch from GPLv2 to GPLv2+

[fw/altos] / altoslib / AltosConvert.java

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index dc0fbb6253608529b0e6e6fb33ec02be7687f21d..288f43ce47857a3af002f0298270be13d2a6c7e5 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_4;
+package org.altusmetrum.altoslib_11;
 
 public class AltosConvert {
        /*
@@ -230,6 +231,12 @@ public class AltosConvert {
                return sensor / 32767.0 * supply * (5.6 + 10.0) / 10.0;
        }
 
+       static double tele_bt_3_battery(int raw) {
+               if (raw == AltosLib.MISSING)
+                       return AltosLib.MISSING;
+               return 3.3 * mega_adc(raw) * (5.1 + 10.0) / 10.0;
+       }
+
        static double easy_mini_voltage(int sensor, int serial) {
                double  supply = 3.3;
                double  diode_offset = 0.0;
@@ -319,6 +326,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 */
        }