projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: --fetchmaps gets same number of maps as GUI
[fw/altos]
/
altoslib
/
AltosConfigData.java
diff --git
a/altoslib/AltosConfigData.java
b/altoslib/AltosConfigData.java
index 2ca5a7a56f74093227285d72176f62b51307e304..c4e108f848e40313b6113ad9e8539231c30f1dcb 100644
(file)
--- a/
altoslib/AltosConfigData.java
+++ b/
altoslib/AltosConfigData.java
@@
-15,7
+15,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
1
;
+package org.altusmetrum.altoslib_
3
;
import java.util.*;
import java.text.*;
import java.util.*;
import java.text.*;
@@
-336,6
+336,10
@@
public class AltosConfigData implements Iterable<String> {
public double frequency() {
int channel = radio_channel;
int setting = radio_setting;
public double frequency() {
int channel = radio_channel;
int setting = radio_setting;
+
+ if (radio_frequency < 0 && channel < 0 && setting < 0)
+ return -1;
+
if (channel < 0)
channel = 0;
if (setting < 0)
if (channel < 0)
channel = 0;
if (setting < 0)