X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosConfigData.java;h=134a0ed2ce0e1d7b3196794b1a45a57187475df7;hb=4828be0ca5252ac9cd6061209385dcd6c4c57965;hp=d8b0b0813b66a7cb709ef7a02e76df3ca6eaf5d5;hpb=c8078d352a7f54a4a97d25af080155d3f875536a;p=fw%2Faltos

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index d8b0b081..134a0ed2 100644
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@ -31,6 +31,7 @@ public class AltosConfigData implements Iterable<String> {
 	public int	log_format;
 	public int	log_space;
 	public String	version;
+	public int	altitude_32;
 
 	/* Strings returned */
 	public LinkedList<String>	lines;
@@ -46,6 +47,7 @@ public class AltosConfigData implements Iterable<String> {
 	public String	callsign;
 	public int	radio_enable;
 	public int	radio_calibration;
+	public int	telemetry_rate;
 	/* Old HAS_RADIO values */
 	public int	radio_channel;
 	public int	radio_setting;
@@ -71,6 +73,7 @@ public class AltosConfigData implements Iterable<String> {
 
 	/* HAS_APRS */
 	public int		aprs_interval;
+	public int		aprs_ssid;
 
 	/* HAS_BEEP */
 	public int		beep;
@@ -234,6 +237,7 @@ public class AltosConfigData implements Iterable<String> {
 		radio_calibration = -1;
 		radio_channel = -1;
 		radio_setting = -1;
+		telemetry_rate = -1;
 
 		accel_cal_plus = -1;
 		accel_cal_minus = -1;
@@ -250,6 +254,7 @@ public class AltosConfigData implements Iterable<String> {
 		pyro_firing_time = -1;
 
 		aprs_interval = -1;
+		aprs_ssid = -1;
 
 		beep = -1;
 
@@ -270,6 +275,7 @@ public class AltosConfigData implements Iterable<String> {
 		try { flight = get_int(line, "current-flight"); } catch (Exception e) {}
 		try { log_format = get_int(line, "log-format"); } catch (Exception e) {}
 		try { log_space = get_int(line, "log-space"); } catch (Exception e) {}
+		try { altitude_32 = get_int(line, "altitude-32"); } catch (Exception e) {}
 		try { version = get_string(line, "software-version"); } catch (Exception e) {}
 
 		/* Version also contains MS5607 info, which we ignore here */
@@ -290,6 +296,7 @@ public class AltosConfigData implements Iterable<String> {
 		try { callsign = get_string(line, "Callsign:"); } catch (Exception e) {}
 		try { radio_enable = get_int(line, "Radio enable:"); } catch (Exception e) {}
 		try { radio_calibration = get_int(line, "Radio cal:"); } catch (Exception e) {}
+		try { telemetry_rate = get_int(line, "Telemetry rate:"); } catch (Exception e) {}
 
 		/* Old HAS_RADIO values */
 		try { radio_channel = get_int(line, "Radio channel:"); } catch (Exception e) {}
@@ -333,6 +340,7 @@ public class AltosConfigData implements Iterable<String> {
 
 		/* 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) {}
@@ -437,6 +445,8 @@ public class AltosConfigData implements Iterable<String> {
 			callsign = source.callsign();
 		if (radio_calibration >= 0)
 			radio_calibration = source.radio_calibration();
+		if (telemetry_rate >= 0)
+			telemetry_rate = source.telemetry_rate();
 
 		/* HAS_ACCEL */
 		if (pad_orientation >= 0)
@@ -459,6 +469,8 @@ public class AltosConfigData implements Iterable<String> {
 		/* 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)
@@ -474,11 +486,13 @@ public class AltosConfigData implements Iterable<String> {
 		dest.set_serial(serial);
 		dest.set_product(product);
 		dest.set_version(version);
+		dest.set_altitude_32(altitude_32);
 		dest.set_main_deploy(main_deploy);
 		dest.set_apogee_delay(apogee_delay);
 		dest.set_apogee_lockout(apogee_lockout);
 		dest.set_radio_calibration(radio_calibration);
 		dest.set_radio_frequency(frequency());
+		dest.set_telemetry_rate(telemetry_rate);
 		boolean max_enabled = true;
 
 		if (log_space() == 0)
@@ -507,6 +521,7 @@ public class AltosConfigData implements Iterable<String> {
 			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_motion(tracker_motion);
 		dest.set_tracker_interval(tracker_interval);
@@ -548,6 +563,9 @@ public class AltosConfigData implements Iterable<String> {
 		if (radio_enable >= 0)
 			link.printf("c e %d\n", radio_enable);
 
+		if (telemetry_rate >= 0)
+			link.printf("c T %d\n", telemetry_rate);
+
 		/* HAS_ACCEL */
 		/* UI doesn't support accel cal */
 		if (pad_orientation >= 0)
@@ -577,6 +595,8 @@ public class AltosConfigData implements Iterable<String> {
 		/* 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)