X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=cf2bc59f35482a89a5df10311a0c48f821579ea1;hb=bc54014cfd4dbca67fa9db66e906ab8212a2eaa2;hp=8cd478e2bd5ff6820bc0e5432deb1d8ad70a4082;hpb=4ff54bb96f6c00c0c2c7dd32f81403bac331621a;p=fw%2Faltos

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 8cd478e2..cf2bc59f 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -190,6 +190,34 @@ public class AltosConvert {
 		return ignite / 32767 * 15.0;
 	}
 
+	public static double
+	barometer_to_pressure(double count)
+	{
+		return ((count / 16.0) / 2047.0 + 0.095) / 0.009 * 1000.0;
+	}
+
+	static double
+	thermometer_to_temperature(double thermo)
+	{
+		return (thermo - 19791.268) / 32728.0 * 1.25 / 0.00247;
+	}
+
+	static double mega_adc(int raw) {
+		return raw / 4095.0;
+	}
+
+	static public double mega_battery_voltage(int v_batt) {
+		if (v_batt != AltosRecord.MISSING)
+			return 3.3 * mega_adc(v_batt) * (15.0 + 27.0) / 27.0;
+		return AltosRecord.MISSING;
+	}
+
+	static double mega_pyro_voltage(int raw) {
+		if (raw != AltosRecord.MISSING)
+			return 3.3 * mega_adc(raw) * (100.0 + 27.0) / 27.0;
+		return AltosRecord.MISSING;
+	}
+
 	public static double radio_to_frequency(int freq, int setting, int cal, int channel) {
 		double	f;