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

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index ace9d62e..35923ec3 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -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) {
@@ -330,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");