X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=cf2bc59f35482a89a5df10311a0c48f821579ea1;hp=a1e2cdcab7715293f08707b92cd03548294909db;hb=77dc89ed5b7bf8f5b3fa3b6131660f1a98f583ea;hpb=c781469ff907a32bd43a5d781391b6859b14cd32

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index a1e2cdca..cf2bc59f 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -196,6 +196,28 @@ public class AltosConvert {
 		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;