X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=760d9eb98c273a0501f15aad1e09b4dc6a6dca67;hb=93e66b4911b7285f9095712ef746571153c3f088;hp=8adec068df82018e3f24c4a774adffb5cdb53d9f;hpb=8d1d8d2a3c129cdbd55427bcda0f26715b02f1ee;p=fw%2Faltos

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 8adec068..760d9eb9 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -18,7 +18,7 @@
 /*
  * Sensor data conversion functions
  */
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_2;
 
 public class AltosConvert {
 	/*
@@ -190,6 +190,46 @@ 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 != AltosLib.MISSING)
+			return 3.3 * mega_adc(v_batt) * (15.0 + 27.0) / 27.0;
+		return AltosLib.MISSING;
+	}
+
+	static double mega_pyro_voltage(int raw) {
+		if (raw != AltosLib.MISSING)
+			return 3.3 * mega_adc(raw) * (100.0 + 27.0) / 27.0;
+		return AltosLib.MISSING;
+	}
+
+	static double tele_mini_voltage(int sensor) {
+		double	supply = 3.3;
+
+		return sensor / 32767.0 * supply * 127/27;
+	}
+
+	static double easy_mini_voltage(int sensor) {
+		double	supply = 3.0;
+
+		return sensor / 32767.0 * supply * 127/27;
+	}
+
 	public static double radio_to_frequency(int freq, int setting, int cal, int channel) {
 		double	f;
 
@@ -242,6 +282,10 @@ public class AltosConvert {
 		return meters * (100 / (2.54 * 12));
 	}
 
+	public static double feet_to_meters(double feet) {
+		return feet * 12 * 2.54 / 100.0;
+	}
+
 	public static double meters_to_miles(double meters) {
 		return meters_to_feet(meters) / 5280;
 	}
@@ -258,6 +302,10 @@ public class AltosConvert {
 		return meters / 9.80665;
 	}
 
+	public static double c_to_f(double c) {
+		return c * 9/5 + 32;
+	}
+
 	public static boolean imperial_units = false;
 
 	public static AltosDistance distance = new AltosDistance();
@@ -268,6 +316,8 @@ public class AltosConvert {
 
 	public static AltosAccel accel = new AltosAccel();
 
+	public static AltosTemperature temperature = new AltosTemperature();
+
 	public static String show_gs(String format, double a) {
 		a = meters_to_g(a);
 		format = format.concat(" g");