X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=5750afad42338f5d24819eb28e7b4b4b7af11342;hb=06908e377b7b932bfe3f6dfc840a0a13340f32ce;hp=8bcb9c9693618df5ce4dcd382fd37648dfe8d64d;hpb=6950506beacb1bcd5b8e54c3935174cf800e9aed;p=fw%2Faltos

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 8bcb9c96..5750afad 100644
--- 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_7;
 
 public class AltosConvert {
 	/*
@@ -224,6 +224,12 @@ 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 easy_mini_voltage(int sensor, int serial) {
 		double	supply = 3.3;
 		double	diode_offset = 0.0;
@@ -343,6 +349,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");