X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=d246018700bfd1d0746330f6724e27ab86f208c9;hp=95c1a99f8384b153e652f228446bce91de967ebd;hb=fab890328d4e1151932621a317226bc291b853da;hpb=f26cfe417c6977cf1e7e75a4f050e25f64d41859

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 95c1a99f..d2460187 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -19,7 +19,7 @@
 /*
  * Sensor data conversion functions
  */
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_13;
 
 import java.util.*;
 
@@ -184,6 +184,18 @@ public class AltosConvert {
 		return altitude;
 	}
 
+	public static double degrees_to_radians(double degrees) {
+		if (degrees == AltosLib.MISSING)
+			return AltosLib.MISSING;
+		return degrees * (Math.PI / 180.0);
+	}
+
+	public static double radians_to_degrees(double radians) {
+		if (radians == AltosLib.MISSING)
+			return AltosLib.MISSING;
+		return radians * (180.0 / Math.PI);
+	}
+
 	public static double
 	cc_battery_to_voltage(double battery)
 	{
@@ -191,7 +203,7 @@ public class AltosConvert {
 	}
 
 	public static double
-	cc_ignitor_to_voltage(double ignite)
+	cc_igniter_to_voltage(double ignite)
 	{
 		return ignite / 32767 * 15.0;
 	}
@@ -258,7 +270,15 @@ public class AltosConvert {
 		return 3.3 * mega_adc(raw) * (5.1 + 10.0) / 10.0;
 	}
 
-	static double easy_mini_voltage(int sensor, int serial) {
+	static double easy_mini_2_adc(int raw) {
+		return raw / 4095.0;
+	}
+
+	static double easy_mini_1_adc(int raw) {
+		return raw / 32767.0;
+	}
+
+	static double easy_mini_1_voltage(int sensor, int serial) {
 		double	supply = 3.3;
 		double	diode_offset = 0.0;
 
@@ -272,7 +292,13 @@ public class AltosConvert {
 		if (serial < 1665)
 			diode_offset = 0.150;
 
-		return sensor / 32767.0 * supply * 127/27 + diode_offset;
+		return easy_mini_1_adc(sensor) * supply * 127/27 + diode_offset;
+	}
+
+	static double easy_mini_2_voltage(int sensor) {
+		double	supply = 3.3;
+
+		return easy_mini_2_adc(sensor) * supply * 127/27;
 	}
 
 	public static double radio_to_frequency(int freq, int setting, int cal, int channel) {
@@ -392,6 +418,7 @@ public class AltosConvert {
 	}
 
 	public static double acceleration_from_sensor(double sensor, double plus_g, double minus_g, double ground) {
+
 		if (sensor == AltosLib.MISSING)
 			return AltosLib.MISSING;
 
@@ -403,6 +430,10 @@ public class AltosConvert {
 
 		double counts_per_g = (plus_g - minus_g) / 2.0;
 		double counts_per_mss = counts_per_g / gravity;
+
+		if (counts_per_mss == 0)
+			return AltosLib.MISSING;
+
 		return (sensor - ground) / counts_per_mss;
 	}
 
@@ -434,6 +465,10 @@ public class AltosConvert {
 
 	public static AltosStateName state_name = new AltosStateName();
 
+	public static AltosPyroName pyro_name = new AltosPyroName();
+
+	public static AltosUnits magnetic_field = null;
+
 	public static String show_gs(String format, double a) {
 		a = meters_to_g(a);
 		format = format.concat(" g");