X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosConvert.java;h=df41a522ad956a967d2d103d65cb95ba8ad26a8f;hb=440226df03a85cd0047d876b57b2a3410bfb2b02;hp=c2ae9a507897079970036ebef8cca8505b306e66;hpb=81bb6f42d8b859195ea5a35806c42d98ba82e8e1;p=fw%2Faltos

diff --git a/altosui/AltosConvert.java b/altosui/AltosConvert.java
index c2ae9a50..df41a522 100644
--- a/altosui/AltosConvert.java
+++ b/altosui/AltosConvert.java
@@ -190,14 +190,18 @@ public class AltosConvert {
 		return ignite / 32767 * 15.0;
 	}
 
-	static double radio_to_frequency(int setting, int cal, int channel) {
+	static double radio_to_frequency(int freq, int setting, int cal, int channel) {
 		double	f;
 
-		if (setting <= 0)
-			setting = cal;
-		f = 434.550 * setting / cal;
-		/* Round to nearest 50KHz */
-		f = Math.floor (20.0 * f + 0.5) / 20.0;
+		if (freq > 0)
+			f = freq / 1000.0;
+		else {
+			if (setting <= 0)
+				setting = cal;
+			f = 434.550 * setting / cal;
+			/* Round to nearest 50KHz */
+			f = Math.floor (20.0 * f + 0.5) / 20.0;
+		}
 		return f + channel * 0.100;
 	}
 
@@ -220,4 +224,36 @@ public class AltosConvert {
 	static double radio_channel_to_frequency(int channel) {
 		return 434.550 + channel * 0.100;
 	}
+
+	static int[] ParseHex(String line) {
+		String[] tokens = line.split("\\s+");
+		int[] array = new int[tokens.length];
+
+		for (int i = 0; i < tokens.length; i++)
+			try {
+				array[i] = Integer.parseInt(tokens[i], 16);
+			} catch (NumberFormatException ne) {
+				return null;
+			}
+		return array;
+	}
+
+	static double meters_to_feet(double meters) {
+		return meters * (100 / (2.54 * 12));
+	}
+
+	static double meters_to_mach(double meters) {
+		return meters / 343;		/* something close to mach at usual rocket sites */
+	}
+
+	static double meters_to_g(double meters) {
+		return meters / 9.80665;
+	}
+
+	static int checksum(int[] data, int start, int length) {
+		int	csum = 0x5a;
+		for (int i = 0; i < length; i++)
+			csum += data[i + start];
+		return csum & 0xff;
+	}
 }