X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=5498ae98cb855f66d42cd858bf275a71ad830b08;hb=7175774c4f60ed3efd54417f2035b50ea0108c7b;hp=a65669dabde9d2f3007536318f52737de1a86f7a;hpb=3871b9ac036e3adfa1da089245fc7973b268c921;p=fw%2Faltos

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index a65669da..5498ae98 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_11;
 
 public class AltosConvert {
 	/*
@@ -208,7 +208,7 @@ public class AltosConvert {
 
 	static public double mega_battery_voltage(int v_batt) {
 		if (v_batt != AltosLib.MISSING)
-			return 3.3 * mega_adc(v_batt) * (15.0 + 27.0) / 27.0;
+			return 3.3 * mega_adc(v_batt) * (5.6 + 10.0) / 10.0;
 		return AltosLib.MISSING;
 	}
 
@@ -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;
@@ -313,6 +325,14 @@ public class AltosConvert {
 		return miles_to_meters(mps) / 3600;
  	}
 
+	public static double mps_to_fps(double mps) {
+		return meters_to_miles(mps) * 5280;
+ 	}
+
+	public static double fps_to_mps(double mps) {
+		return miles_to_meters(mps) / 5280;
+ 	}
+
 	public static double meters_to_mach(double meters) {
 		return meters / 343;		/* something close to mach at usual rocket sites */
 	}
@@ -343,6 +363,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");