X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=8617a12cea7a5def8d7062cde0f3aea11e4561d6;hb=217d77dadbef4192d2f32e290a5c5f50159f2e0d;hp=288f43ce47857a3af002f0298270be13d2a6c7e5;hpb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;p=fw%2Faltos

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 288f43ce..8617a12c 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;
@@ -350,6 +366,10 @@ public class AltosConvert {
 		return (c - 32) * 5/9;
 	}
 
+	public static double psi_to_pa(double psi) {
+		return psi * 6894.76;
+	}
+
 	public static boolean imperial_units = false;
 
 	public static AltosDistance distance = new AltosDistance();