X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosConfigData.java;h=83c184cdd8299590a386b3c3b2599c926f5e552f;hb=7385c76af46ff400b9e79a8540199be289cb57c0;hp=1c3085bd7efc2f39ee41bddabdb806fe82960bfd;hpb=77b04d662a6704f5db10522a2f9b169d31df5bea;p=fw%2Faltos

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index 1c3085bd..83c184cd 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_2;
+package org.altusmetrum.altoslib_4;
 
 import java.util.*;
 import java.text.*;
@@ -70,6 +70,9 @@ public class AltosConfigData implements Iterable<String> {
 	/* HAS_APRS */
 	public int		aprs_interval;
 
+	/* HAS_BEEP */
+	public int		beep;
+
 	/* Storage info replies */
 	public int	storage_size;
 	public int	storage_erase_unit;
@@ -77,6 +80,9 @@ public class AltosConfigData implements Iterable<String> {
 	/* Log listing replies */
 	public int	stored_flight;
 
+	/* HAS_TRACKER */
+	public int[]	tracker_distances;
+
 	public static String get_string(String line, String label) throws  ParseException {
 		if (line.startsWith(label)) {
 			String	quoted = line.substring(label.length()).trim();
@@ -100,6 +106,20 @@ public class AltosConfigData implements Iterable<String> {
 		throw new ParseException("mismatch", 0);
 	}
 
+	public static int[] get_distances(String line, String label) throws NumberFormatException, ParseException {
+		if (line.startsWith(label)) {
+			String tail = line.substring(label.length()).trim();
+			String[] tokens = tail.split("\\s+");
+			if (tokens.length > 1) {
+				int[]	distances = new int[2];
+				distances[0] = Integer.parseInt(tokens[0]);
+				distances[1] = Integer.parseInt(tokens[1]);
+				return distances;
+			}
+		}
+		throw new ParseException("mismatch", 0);
+	}
+
 	public Iterator<String> iterator() {
 		return lines.iterator();
 	}
@@ -210,6 +230,10 @@ public class AltosConfigData implements Iterable<String> {
 
 		aprs_interval = -1;
 
+		beep = -1;
+
+		tracker_distances = null;
+
 		storage_size = -1;
 		storage_erase_unit = -1;
 		stored_flight = 0;
@@ -286,6 +310,12 @@ public class AltosConfigData implements Iterable<String> {
 		/* HAS_APRS */
 		try { aprs_interval = get_int(line, "APRS interval:"); } catch (Exception e) {}
 
+		/* HAS_BEEP */
+		try { beep = get_int(line, "Beeper setting:"); } catch (Exception e) {}
+
+		/* HAS_TRACKER */
+		try { tracker_distances = get_distances(line, "Tracker setting:"); } catch (Exception e) {}
+
 		/* Storage info replies */
 		try { storage_size = get_int(line, "Storage size:"); } catch (Exception e) {}
 		try { storage_erase_unit = get_int(line, "Storage erase unit:"); } catch (Exception e) {}
@@ -351,9 +381,22 @@ public class AltosConfigData implements Iterable<String> {
 						       channel);
 	}
 
+	boolean use_flash_for_config() {
+		if (product.startsWith("TeleMega"))
+			return false;
+		if (product.startsWith("TeleMetrum-v2"))
+			return false;
+		return true;
+	}
+
+
 	public int log_limit() {
-		if (storage_size > 0 && storage_erase_unit > 0) {
-			int	log_limit = storage_size - storage_erase_unit;
+		if (storage_size > 0) {
+			int	log_limit = storage_size;
+
+			if (storage_erase_unit > 0 && use_flash_for_config())
+				log_limit -= storage_erase_unit;
+
 			if (log_limit > 0)
 				return log_limit / 1024;
 		}
@@ -396,8 +439,16 @@ public class AltosConfigData implements Iterable<String> {
 		if (npyro > 0)
 			pyros = source.pyros();
 
+		/* HAS_APRS */
 		if (aprs_interval >= 0)
 			aprs_interval = source.aprs_interval();
+
+		/* HAS_BEEP */
+		if (beep >= 0)
+			beep = source.beep();
+		/* HAS_TRACKER */
+		if (tracker_distances != null)
+			tracker_distances = source.tracker_distances();
 	}
 
 	public void set_values(AltosConfigValues dest) {
@@ -410,15 +461,20 @@ public class AltosConfigData implements Iterable<String> {
 		dest.set_radio_calibration(radio_calibration);
 		dest.set_radio_frequency(frequency());
 		boolean max_enabled = true;
+
+		if (log_limit() == 0)
+			max_enabled = false;
+
 		switch (log_format) {
 		case AltosLib.AO_LOG_FORMAT_TINY:
 			max_enabled = false;
 			break;
 		default:
-			if (stored_flight >= 0)
+			if (stored_flight > 0)
 				max_enabled = false;
 			break;
 		}
+
 		dest.set_flight_log_max_enabled(max_enabled);
 		dest.set_radio_enable(radio_enable);
 		dest.set_flight_log_max_limit(log_limit());
@@ -431,6 +487,8 @@ public class AltosConfigData implements Iterable<String> {
 		else
 			dest.set_pyros(null);
 		dest.set_aprs_interval(aprs_interval);
+		dest.set_beep(beep);
+		dest.set_tracker_distances(tracker_distances);
 	}
 
 	public void save(AltosLink link, boolean remote) throws InterruptedException, TimeoutException {
@@ -497,6 +555,14 @@ public class AltosConfigData implements Iterable<String> {
 		if (aprs_interval >= 0)
 			link.printf("c A %d\n", aprs_interval);
 
+		/* HAS_BEEP */
+		if (beep >= 0)
+			link.printf("c b %d\n", beep);
+
+		/* HAS_TRACKER */
+		if (tracker_distances != null)
+			link.printf("c t %d %d\n", tracker_distances[0], tracker_distances[1]);
+
 		link.printf("c w\n");
 		link.flush_output();
 	}