Bump Java library versions

[fw/altos] / altoslib / AltosConvert.java

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 8bcb9c9693618df5ce4dcd382fd37648dfe8d64d..fd2f5750ef6ed4aafd79970438408cff6ddfc760 100644 (file)
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -18,7 +18,7 @@
 /*
  * Sensor data conversion functions
  */
-package org.altusmetrum.altoslib_4;
+package org.altusmetrum.altoslib_8;
 
 public class AltosConvert {
        /*
@@ -224,6 +224,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;
@@ -343,6 +355,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");