X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosConfigData.java;h=3bf8ea43d2ad4b0601fa975612947f0ea2ac5006;hb=c20ddde2f9eb0ad8dbb982e9d0cbe91639160a34;hp=9462ae6f4d62f8b9eae3b01a442436d711e53ee3;hpb=ae1174317fc476e39077f7dc257ec08709c6b301;p=fw%2Faltos

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index 9462ae6f..3bf8ea43 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_4;
+package org.altusmetrum.altoslib_5;
 
 import java.util.*;
 import java.text.*;
@@ -67,9 +67,11 @@ public class AltosConfigData implements Iterable<String> {
 	public AltosPyro[]	pyros;
 	public int		npyro;
 	public int		pyro;
+	public double		pyro_firing_time;
 
 	/* HAS_APRS */
 	public int		aprs_interval;
+	public int		aprs_ssid;
 
 	/* HAS_BEEP */
 	public int		beep;
@@ -82,7 +84,8 @@ public class AltosConfigData implements Iterable<String> {
 	public int	stored_flight;
 
 	/* HAS_TRACKER */
-	public int[]	tracker_distances;
+	public int	tracker_motion;
+	public int	tracker_interval;
 
 	public static String get_string(String line, String label) throws  ParseException {
 		if (line.startsWith(label)) {
@@ -107,15 +110,15 @@ public class AltosConfigData implements Iterable<String> {
 		throw new ParseException("mismatch", 0);
 	}
 
-	public static int[] get_distances(String line, String label) throws NumberFormatException, ParseException {
+	public static int[] get_values(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;
+				int[]	values = new int[2];
+				values[0] = Integer.parseInt(tokens[0]);
+				values[1] = Integer.parseInt(tokens[1]);
+				return values;
 			}
 		}
 		throw new ParseException("mismatch", 0);
@@ -245,12 +248,15 @@ public class AltosConfigData implements Iterable<String> {
 		pyro = 0;
 		npyro = 0;
 		pyros = null;
+		pyro_firing_time = -1;
 
 		aprs_interval = -1;
+		aprs_ssid = -1;
 
 		beep = -1;
 
-		tracker_distances = null;
+		tracker_motion = -1;
+		tracker_interval = -1;
 
 		storage_size = -1;
 		storage_erase_unit = -1;
@@ -325,15 +331,21 @@ public class AltosConfigData implements Iterable<String> {
 					pyros[pyro++] = p;
 			} catch (Exception e) {}
 		}
+		try { pyro_firing_time = get_int(line, "Pyro time:") / 100.0; } catch (Exception e) {}
 
 		/* HAS_APRS */
 		try { aprs_interval = get_int(line, "APRS interval:"); } catch (Exception e) {}
+		try { aprs_ssid = get_int(line, "APRS SSID:"); } 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) {}
+		try {
+			int[] values = get_values(line, "Tracker setting:");
+			tracker_motion = values[0];
+			tracker_interval = values[1];
+		} catch (Exception e) {}
 
 		/* Storage info replies */
 		try { storage_size = get_int(line, "Storage size:"); } catch (Exception e) {}
@@ -444,17 +456,23 @@ public class AltosConfigData implements Iterable<String> {
 		/* AO_PYRO_NUM */
 		if (npyro > 0)
 			pyros = source.pyros();
+		if (pyro_firing_time >= 0)
+			pyro_firing_time = source.pyro_firing_time();
 
 		/* HAS_APRS */
 		if (aprs_interval >= 0)
 			aprs_interval = source.aprs_interval();
+		if (aprs_ssid >= 0)
+			aprs_ssid = source.aprs_ssid();
 
 		/* HAS_BEEP */
 		if (beep >= 0)
 			beep = source.beep();
 		/* HAS_TRACKER */
-		if (tracker_distances != null)
-			tracker_distances = source.tracker_distances();
+		if (tracker_motion >= 0)
+			tracker_motion = source.tracker_motion();
+		if (tracker_interval >= 0)
+			tracker_interval = source.tracker_interval();
 	}
 
 	public void set_values(AltosConfigValues dest) {
@@ -492,9 +510,12 @@ public class AltosConfigData implements Iterable<String> {
 			dest.set_pyros(pyros);
 		else
 			dest.set_pyros(null);
+		dest.set_pyro_firing_time(pyro_firing_time);
 		dest.set_aprs_interval(aprs_interval);
+		dest.set_aprs_ssid(aprs_ssid);
 		dest.set_beep(beep);
-		dest.set_tracker_distances(tracker_distances);
+		dest.set_tracker_motion(tracker_motion);
+		dest.set_tracker_interval(tracker_interval);
 	}
 
 	public void save(AltosLink link, boolean remote) throws InterruptedException, TimeoutException {
@@ -556,18 +577,22 @@ public class AltosConfigData implements Iterable<String> {
 						   pyros[p].toString());
 			}
 		}
+		if (pyro_firing_time >= 0)
+			link.printf("c I %d\n", (int) (pyro_firing_time * 100.0 + 0.5));
 
 		/* HAS_APRS */
 		if (aprs_interval >= 0)
 			link.printf("c A %d\n", aprs_interval);
+		if (aprs_ssid >= 0)
+			link.printf("c S %d\n", aprs_ssid);
 
 		/* 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]);
+		if (tracker_motion >= 0 && tracker_interval >= 0)
+			link.printf("c t %d %d\n", tracker_motion, tracker_interval);
 
 		link.printf("c w\n");
 		link.flush_output();