X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosConvert.java;h=0b41328739d1797ab4c6491cbfe4fe198f667867;hb=190cdaa5cb18e78caeeaaaaed6a9d304e939eb6b;hp=59092a6fcfa262442cf4f903e7b7307eaa3c59ef;hpb=7041c386cdf37716f8daf0bc1a9204db620e3de9;p=fw%2Faltos

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index 59092a6f..0b413287 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
@@ -18,7 +19,7 @@
 /*
  * Sensor data conversion functions
  */
-package org.altusmetrum.altoslib_9;
+package org.altusmetrum.altoslib_11;
 
 public class AltosConvert {
 	/*
@@ -218,7 +219,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;
@@ -325,6 +342,14 @@ public class AltosConvert {
 		return miles_to_meters(mps) / 3600;
  	}
 
+	public static double mps_to_fps(double mps) {
+		return meters_to_miles(mps) * 5280;
+ 	}
+
+	public static double fps_to_mps(double mps) {
+		return miles_to_meters(mps) / 5280;
+ 	}
+
 	public static double meters_to_mach(double meters) {
 		return meters / 343;		/* something close to mach at usual rocket sites */
 	}