X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=ce1b8f7f14f7733a29722e6eedd62090733ed63f;hp=3e1796b2c194bfbeb212a9adbe675a0917642201;hb=HEAD;hpb=611ef4497b97bcf5239d6bc2ee13eeba9efd1503

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 3e1796b2..84f7e23d 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -270,6 +270,12 @@ public class AltosConvert {
 		return sensor / 4095.0 * supply * (5.6 + 10.0) / 10.0;
 	}
 
+	static double tele_gps_3_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;
@@ -311,6 +317,10 @@ public class AltosConvert {
 		return easy_mini_2_adc(sensor) * supply * 127/27;
 	}
 
+	static double easy_mini_3_voltage(int sensor) {
+		return easy_mini_1_voltage(sensor, 10000);
+	}
+
 	static double motor_pressure(double voltage) {
 		double	base = 0.5;
 		double	max = 4.5;
@@ -549,7 +559,7 @@ public class AltosConvert {
 
 	public static int beep_freq_to_value(double freq) {
 		if (freq == 0)
-			return 94;
+			return 0;
 		return (int) Math.floor (1.0/2.0 * (24.0e6/32.0) / freq + 0.5);
 	}