X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=63cdfa6092db2e30b2f70bb00491cde2c4ff47b5;hp=e1930430add0de07f49812808e053edfa5b0e38e;hb=52149fd81df45f37f5097850795f290f463c43ef;hpb=6aa451ce81bfdfe679e3f9902043a5f0d235c745

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index e1930430..63cdfa60 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -19,7 +19,7 @@
 /*
  * Sensor data conversion functions
  */
-package org.altusmetrum.altoslib_13;
+package org.altusmetrum.altoslib_14;
 
 import java.util.*;
 
@@ -258,7 +258,13 @@ 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;
@@ -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);