X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=a3343a4f200aad0171696a31aaa88545c282b026;hp=5498ae98cb855f66d42cd858bf275a71ad830b08;hb=258808d296aeadaf150fa9b07e9c99a6bf1ca7c8;hpb=97adfff4cfb67c17a96f3ff46606b4e439422b01

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 5498ae98..a3343a4f 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,6 +21,8 @@
  */
 package org.altusmetrum.altoslib_11;
 
+import java.util.*;
+
 public class AltosConvert {
 	/*
 	 * Pressure Sensor Model, version 1.1
@@ -218,7 +221,23 @@ public class AltosConvert {
 		return AltosLib.MISSING;
 	}
 
-	static double tele_mini_voltage(int sensor) {
+	static double tele_mini_3_adc(int raw) {
+		return raw / 4095.0;
+	}
+
+	static public double tele_mini_3_battery_voltage(int v_batt) {
+		if (v_batt != AltosLib.MISSING)
+			return 3.3 * tele_mini_3_adc(v_batt) * (5.6 + 10.0) / 10.0;
+		return AltosLib.MISSING;
+	}
+
+	static double tele_mini_3_pyro_voltage(int raw) {
+		if (raw != AltosLib.MISSING)
+			return 3.3 * tele_mini_3_adc(raw) * (100.0 + 27.0) / 27.0;
+		return AltosLib.MISSING;
+	}
+
+	static double tele_mini_2_voltage(int sensor) {
 		double	supply = 3.3;
 
 		return sensor / 32767.0 * supply * 127/27;
@@ -349,12 +368,32 @@ public class AltosConvert {
 		return (c - 32) * 5/9;
 	}
 
+	public static double psi_to_pa(double psi) {
+		return psi * 6894.76;
+	}
+
+	public static double pa_to_psi(double pa) {
+		return pa / 6894.76;
+	}
+
+	public static double n_to_lb(double n) {
+		return n * 0.22480894;
+	}
+
+	public static double lb_to_n(double lb) {
+		return lb / 0.22480894;
+	}
+
 	public static boolean imperial_units = false;
 
 	public static AltosDistance distance = new AltosDistance();
 
 	public static AltosHeight height = new AltosHeight();
 
+	public static AltosPressure pressure = new AltosPressure();
+
+	public static AltosForce force = new AltosForce();
+
 	public static AltosSpeed speed = new AltosSpeed();
 
 	public static AltosAccel accel = new AltosAccel();
@@ -369,6 +408,8 @@ public class AltosConvert {
 
 	public static AltosLongitude longitude = new AltosLongitude();
 
+	public static AltosRotationRate rotation_rate = new AltosRotationRate();
+
 	public static String show_gs(String format, double a) {
 		a = meters_to_g(a);
 		format = format.concat(" g");
@@ -386,6 +427,13 @@ public class AltosConvert {
 		return csum & 0xff;
 	}
 
+	public static int checksum(List<Byte> data, int start, int length) {
+		int	csum = 0x5a;
+		for (int i = 0; i < length; i++)
+			csum += data.get(i+start);
+		return csum & 0xff;
+	}
+
 	public static double beep_value_to_freq(int value) {
 		if (value == 0)
 			return 4000;