X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosConvert.java;fp=altosui%2FAltosConvert.java;h=df41a522ad956a967d2d103d65cb95ba8ad26a8f;hp=db7039ec5294a5dc16b8e99248a6612360fb3a0a;hb=d8ebb83e64d66fa159e75aa560d39d80bb6d9d04;hpb=c1d12a117b36de7fe8dd992959b890bfd1163e81

diff --git a/altosui/AltosConvert.java b/altosui/AltosConvert.java
index db7039ec..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;
 	}