X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosConvert.java;fp=altoslib%2FAltosConvert.java;h=0b41328739d1797ab4c6491cbfe4fe198f667867;hp=288f43ce47857a3af002f0298270be13d2a6c7e5;hb=1029a6e4a61b20698e00e29fc0c8c3877f1e7b0f;hpb=5c272d8e50d0b23f31a6a9ebdad81fc514936222

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 288f43ce..0b413287 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -219,7 +219,23 @@ public class AltosConvert {
 		return AltosLib.MISSING;
 	}
 
-	static double tele_mini_voltage(int sensor) {
+	static double tele_mini_3_adc(int raw) {
+		return raw / 4095.0;
+	}
+
+	static public double tele_mini_3_battery_voltage(int v_batt) {
+		if (v_batt != AltosLib.MISSING)
+			return 3.3 * tele_mini_3_adc(v_batt) * (5.6 + 10.0) / 10.0;
+		return AltosLib.MISSING;
+	}
+
+	static double tele_mini_3_pyro_voltage(int raw) {
+		if (raw != AltosLib.MISSING)
+			return 3.3 * tele_mini_3_adc(raw) * (100.0 + 27.0) / 27.0;
+		return AltosLib.MISSING;
+	}
+
+	static double tele_mini_2_voltage(int sensor) {
 		double	supply = 3.3;
 
 		return sensor / 32767.0 * supply * 127/27;