X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=89f36a6c4a373f66a90dc2612ae6e39e66d92506;hb=f400b8dd98680e47645d43940bcff5c0c99bb9e9;hp=9eb8d16a4dafa6fe47c1c4d0482ba022264ec98a;hpb=3fa1eadb91eea001342d2d357d7aaf661e8a2a5d;p=fw%2Faltos

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 9eb8d16a..89f36a6c 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -19,7 +19,7 @@
 /*
  * Sensor data conversion functions
  */
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_13;
 
 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);