diff options
| author | Keith Packard <keithp@keithp.com> | 2017-06-11 22:42:25 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2017-06-11 22:54:22 -0700 |
| commit | ffbacb4ba9fc52de18bc54eb0d4b9e4f015ad1a4 (patch) | |
| tree | df2ab69356d7ae356f2ef86ba4b520cb29012fe3 /altoslib | |
| parent | 8da38e5217f366a7da24a8af4a5ca620fad35df3 (diff) | |
altoslib: Missing config values now AltosLib.MISSING, not zero or negative
Also fix AltosConfigData.java
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altoslib')
| -rw-r--r-- | altoslib/AltosConfigData.java | 9 |
1 files changed, 4 insertions, 5 deletions
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, |