From: Keith Packard <keithp@keithp.com>
Date: Mon, 12 Jun 2017 05:42:25 +0000 (-0700)
Subject: altoslib: Missing config values now AltosLib.MISSING, not zero or negative
X-Git-Tag: 1.8~45
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=ffbacb4ba9fc52de18bc54eb0d4b9e4f015ad1a4;hp=8da38e5217f366a7da24a8af4a5ca620fad35df3

altoslib: Missing config values now AltosLib.MISSING, not zero or negative

Also fix AltosConfigData.java

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index c39a6c94..a0e9a292 100644
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@ -451,8 +451,7 @@ public class AltosConfigData {
 			radio_frequency = (int) Math.floor (freq * 1000 + 0.5);
 			radio_channel = AltosLib.MISSING;
 		} else if (setting != AltosLib.MISSING) {
-			radio_setting =AltosConvert.radio_frequency_to_setting(freq,
-										    radio_calibration);
+			radio_setting =AltosConvert.radio_frequency_to_setting(freq, radio_calibration);
 			radio_channel = AltosLib.MISSING;
 		} else {
 			radio_channel = AltosConvert.radio_frequency_to_channel(freq);
@@ -463,12 +462,12 @@ public class AltosConfigData {
 		int	channel = radio_channel;
 		int	setting = radio_setting;
 
-		if (radio_frequency < 0 && channel < 0 && setting < 0)
+		if (radio_frequency == AltosLib.MISSING && channel == AltosLib.MISSING && setting == AltosLib.MISSING)
 			return AltosLib.MISSING;
 
-		if (channel < 0)
+		if (channel == AltosLib.MISSING)
 			channel = 0;
-		if (setting < 0)
+		if (setting == AltosLib.MISSING)
 			setting = 0;
 
 		return AltosConvert.radio_to_frequency(radio_frequency,