Bump java lib versions in preparation for 1.9.2

[fw/altos] / altoslib / AltosConvert.java

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index ed16541a7d832a5a5424340470f8b053145f22bb..63cdfa6092db2e30b2f70bb00491cde2c4ff47b5 100644 (file)
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -19,7 +19,7 @@
 /*
  * Sensor data conversion functions
  */
-package org.altusmetrum.altoslib_12;
+package org.altusmetrum.altoslib_14;
 
 import java.util.*;
 
@@ -258,12 +258,18 @@ public class AltosConvert {
                return sensor / 32767.0 * supply * 127/27;
        }
 
-       static double tele_gps_voltage(int sensor) {
+       static double tele_gps_1_voltage(int sensor) {
                double  supply = 3.3;
 
                return sensor / 32767.0 * supply * (5.6 + 10.0) / 10.0;
        }
 
+       static double tele_gps_2_voltage(int sensor) {
+               double  supply = 3.3;
+
+               return sensor / 4095.0 * supply * (5.6 + 10.0) / 10.0;
+       }
+
        static double tele_bt_3_battery(int raw) {
                if (raw == AltosLib.MISSING)
                        return AltosLib.MISSING;
@@ -467,7 +473,7 @@ public class AltosConvert {
 
        public static AltosPyroName pyro_name = new AltosPyroName();
 
-       public static AltosUnits magnetic_field = null;
+       public static AltosUnits magnetic_field = new AltosGauss();
 
        public static String show_gs(String format, double a) {
                a = meters_to_g(a);