X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=35923ec3c3dbd1308e2f6d75b1959fcc760efa71;hp=760d9eb98c273a0501f15aad1e09b4dc6a6dca67;hb=21d584b9bf93b96a05ab374105493c0e17df320f;hpb=488a527267decece48e6682e0e0c7fc29cbed329

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 760d9eb9..35923ec3 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -18,7 +18,7 @@
 /*
  * Sensor data conversion functions
  */
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_3;
 
 public class AltosConvert {
 	/*
@@ -224,10 +224,21 @@ public class AltosConvert {
 		return sensor / 32767.0 * supply * 127/27;
 	}
 
-	static double easy_mini_voltage(int sensor) {
-		double	supply = 3.0;
+	static double easy_mini_voltage(int sensor, int serial) {
+		double	supply = 3.3;
+		double	diode_offset = 0.0;
 
-		return sensor / 32767.0 * supply * 127/27;
+		/* early prototypes had a 3.0V regulator */
+		if (serial < 1000)
+			supply = 3.0;
+
+		/* Purple v1.0 boards had the sensor after the
+		 * blocking diode, which drops about 150mV
+		 */
+		if (serial < 1665)
+			diode_offset = 0.150;
+
+		return sensor / 32767.0 * supply * 127/27 + diode_offset;
 	}
 
 	public static double radio_to_frequency(int freq, int setting, int cal, int channel) {
@@ -290,10 +301,18 @@ public class AltosConvert {
 		return meters_to_feet(meters) / 5280;
 	}
 
+	public static double miles_to_meters(double miles) {
+		return feet_to_meters(miles * 5280);
+	}
+
 	public static double meters_to_mph(double mps) {
 		return meters_to_miles(mps) * 3600;
  	}
 
+	public static double mph_to_meters(double mps) {
+		return miles_to_meters(mps) / 3600;
+ 	}
+
 	public static double meters_to_mach(double meters) {
 		return meters / 343;		/* something close to mach at usual rocket sites */
 	}
@@ -306,6 +325,10 @@ public class AltosConvert {
 		return c * 9/5 + 32;
 	}
 
+	public static double f_to_c(double c) {
+		return (c - 32) * 5/9;
+	}
+
 	public static boolean imperial_units = false;
 
 	public static AltosDistance distance = new AltosDistance();
@@ -318,6 +341,8 @@ public class AltosConvert {
 
 	public static AltosTemperature temperature = new AltosTemperature();
 
+	public static AltosOrient orient = new AltosOrient();
+
 	public static String show_gs(String format, double a) {
 		a = meters_to_g(a);
 		format = format.concat(" g");