Switch from GPLv2 to GPLv2+

[fw/altos] / altoslib / AltosConvert.java

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 484f621377f1f168cd0920d0f9e0d482c5c31bd2..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 {
        /*
@@ -208,7 +209,7 @@ public class AltosConvert {
 
        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 3.3 * mega_adc(v_batt) * (5.6 + 10.0) / 10.0;
                return AltosLib.MISSING;
        }
 
@@ -224,6 +225,18 @@ public class AltosConvert {
                return sensor / 32767.0 * supply * 127/27;
        }
 
+       static double tele_gps_voltage(int sensor) {
+               double  supply = 3.3;
+
+               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;
@@ -313,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 */
        }
@@ -343,6 +364,12 @@ public class AltosConvert {
 
        public static AltosOrient orient = new AltosOrient();
 
+       public static AltosVoltage voltage = new AltosVoltage();
+
+       public static AltosLatitude latitude = new AltosLatitude();
+
+       public static AltosLongitude longitude = new AltosLongitude();
+
        public static String show_gs(String format, double a) {
                a = meters_to_g(a);
                format = format.concat(" g");
@@ -371,4 +398,30 @@ public class AltosConvert {
                        return 94;
                return (int) Math.floor (1.0/2.0 * (24.0e6/32.0) / freq + 0.5);
        }
+
+       public static final int BEARING_LONG = 0;
+       public static final int BEARING_SHORT = 1;
+       public static final int BEARING_VOICE = 2;
+
+       public static String bearing_to_words(int length, double bearing) {
+               String [][] bearing_string = {
+                       {
+                               "North", "North North East", "North East", "East North East",
+                               "East", "East South East", "South East", "South South East",
+                               "South", "South South West", "South West", "West South West",
+                               "West", "West North West", "North West", "North North West"
+                       }, {
+                               "N", "NNE", "NE", "ENE",
+                               "E", "ESE", "SE", "SSE",
+                               "S", "SSW", "SW", "WSW",
+                               "W", "WNW", "NW", "NNW"
+                       }, {
+                               "north", "nor nor east", "north east", "east nor east",
+                               "east", "east sow east", "south east", "sow sow east",
+                               "south", "sow sow west", "south west", "west sow west",
+                               "west", "west nor west", "north west", "nor nor west "
+                       }
+               };
+               return bearing_string[length][(int)((bearing / 90 * 8 + 1) / 2)%16];
+       }
 }