X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosConfigData.java;h=c4e108f848e40313b6113ad9e8539231c30f1dcb;hp=12659d88100322bffdca273180047356951551fa;hb=14790172e02d4e1624c35797f87ffd94345d54ff;hpb=a9cf50c9f29f42cc3ca0daff3c69a4087cf9aa1c

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index 12659d88..c4e108f8 100644
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@ -15,7 +15,7 @@
  * 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.*;
@@ -135,6 +135,12 @@ public class AltosConfigData implements Iterable<String> {
 		}
 	}
 
+	public boolean has_monitor_battery() {
+		if (product.startsWith("TeleBT"))
+			return true;
+		return false;
+	}
+
 	int[] parse_version(String v) {
 		String[] parts = v.split("\\.");
 		int r[] = new int[parts.length];
@@ -330,6 +336,10 @@ public class AltosConfigData implements Iterable<String> {
 	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)
@@ -476,7 +486,7 @@ public class AltosConfigData implements Iterable<String> {
 		/* UI doesn't support AES key config */
 
 		/* AO_PYRO_NUM */
-		if (pyros.length > 0) {
+		if (npyro > 0) {
 			for (int p = 0; p < pyros.length; p++) {
 				link.printf("c P %s\n",
 						   pyros[p].toString());
@@ -498,7 +508,7 @@ public class AltosConfigData implements Iterable<String> {
 		switch (log_format) {
 		case AltosLib.AO_LOG_FORMAT_FULL:
 		case AltosLib.AO_LOG_FORMAT_TINY:
-		case AltosLib.AO_LOG_FORMAT_MEGAMETRUM:
+		case AltosLib.AO_LOG_FORMAT_TELEMEGA:
 			link.printf("l\n");
 			read_link(link, "done");
 		default: