Merge branch 'master' into aprs

3 files changed, 264 insertions, 12 deletions

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index ddc49e88..515ff480 100644
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@ -39,7 +39,7 @@ public class AltosConfigData implements Iterable<String> {
 	public int	main_deploy;
 	public int	apogee_delay;
 	public int	apogee_lockout;
-	
+
 	/* HAS_RADIO */
 	public int	radio_frequency;
 	public String	callsign;
@@ -136,7 +136,7 @@ public class AltosConfigData implements Iterable<String> {
 
 		return r;
 	}
-	
+
 	public int compare_version(String other) {
 		int[]	me = parse_version(version);
 		int[]	them = parse_version(other);
@@ -165,14 +165,14 @@ public class AltosConfigData implements Iterable<String> {
 		log_format = AltosLib.AO_LOG_FORMAT_UNKNOWN;
 		version = "unknown";
 
-		main_deploy = 250;
-		apogee_delay = 0;
-		apogee_lockout = 0;
+		main_deploy = -1;
+		apogee_delay = -1;
+		apogee_lockout = -1;
 
-		radio_frequency = 0;
-		callsign = "N0CALL";
+		radio_frequency = -1;
+		callsign = null;
 		radio_enable = -1;
-		radio_calibration = 0;
+		radio_calibration = -1;
 		radio_channel = -1;
 		radio_setting = -1;
 
@@ -180,7 +180,7 @@ public class AltosConfigData implements Iterable<String> {
 		accel_cal_minus = -1;
 		pad_orientation = -1;
 
-		flight_log_max = 0;
+		flight_log_max = -1;
 		ignite_mode = -1;
 
 		aes_key = "";
@@ -193,7 +193,7 @@ public class AltosConfigData implements Iterable<String> {
 		storage_erase_unit = -1;
 		stored_flight = -1;
 	}
-	
+
 	public void parse_line(String line) {
 		lines.add(line);
 		/* Version replies */
@@ -257,11 +257,11 @@ public class AltosConfigData implements Iterable<String> {
 		if (npyro > 0) {
 			try {
 				AltosPyro p = new AltosPyro(pyro, line);
-				if (pyro < npyro - 1)
+				if (pyro < npyro)
 					pyros[pyro++] = p;
 			} 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) {}
@@ -289,6 +289,182 @@ public class AltosConfigData implements Iterable<String> {
 		}
 	}
 
+	public boolean has_frequency() {
+		return radio_frequency >= 0 || radio_setting >= 0 || radio_channel >= 0;
+	}
+
+	public void set_frequency(double freq) {
+		int	frequency = radio_frequency;
+		int	setting = radio_setting;
+
+		if (frequency > 0) {
+			radio_frequency = (int) Math.floor (freq * 1000 + 0.5);
+			radio_channel = -1;
+		} else if (setting > 0) {
+			radio_setting =AltosConvert.radio_frequency_to_setting(freq,
+										    radio_calibration);
+			radio_channel = -1;
+		} else {
+			radio_channel = AltosConvert.radio_frequency_to_channel(freq);
+		}
+	}
+
+	public double frequency() {
+		int	channel = radio_channel;
+		int	setting = radio_setting;
+		if (channel < 0)
+			channel = 0;
+		if (setting < 0)
+			setting = 0;
+
+		return AltosConvert.radio_to_frequency(radio_frequency,
+						       setting,
+						       radio_calibration,
+						       channel);
+	}
+
+	public int log_limit() {
+		if (storage_size > 0 && storage_erase_unit > 0) {
+			int	log_limit = storage_size - storage_erase_unit;
+			if (log_limit > 0)
+				return log_limit / 1024;
+		}
+		return 1024;
+	}
+
+	public void get_values(AltosConfigValues source) {
+
+		/* HAS_FLIGHT */
+		if (main_deploy >= 0)
+			main_deploy = source.main_deploy();
+		if (apogee_delay >= 0)
+			apogee_delay = source.apogee_delay();
+		if (apogee_lockout >= 0)
+			apogee_lockout = source.apogee_lockout();
+
+		/* HAS_RADIO */
+		if (has_frequency())
+			set_frequency(source.radio_frequency());
+		if (radio_enable >= 0)
+			radio_enable = source.radio_enable();
+		if (callsign != null)
+			callsign = source.callsign();
+		if (radio_calibration >= 0)
+			radio_calibration = source.radio_calibration();
+
+		/* HAS_ACCEL */
+		if (pad_orientation >= 0)
+			pad_orientation = source.pad_orientation();
+
+		/* HAS_LOG */
+		if (flight_log_max >= 0)
+			flight_log_max = source.flight_log_max();
+
+		/* HAS_IGNITE */
+		if (ignite_mode >= 0)
+			ignite_mode = source.ignite_mode();
+
+		/* AO_PYRO_NUM */
+		if (npyro > 0)
+			pyros = source.pyros();
+	}
+
+	public void set_values(AltosConfigValues dest) {
+		dest.set_serial(serial);
+		dest.set_product(product);
+		dest.set_version(version);
+		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());
+		boolean max_enabled = true;
+		switch (log_format) {
+		case AltosLib.AO_LOG_FORMAT_TINY:
+			max_enabled = false;
+			break;
+		default:
+			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());
+		dest.set_flight_log_max(flight_log_max);
+		dest.set_ignite_mode(ignite_mode);
+		dest.set_pad_orientation(pad_orientation);
+		dest.set_callsign(callsign);
+		if (npyro > 0)
+			dest.set_pyros(pyros);
+		else
+			dest.set_pyros(null);
+	}
+
+	public void save(AltosLink link, boolean remote) throws InterruptedException, TimeoutException {
+
+		/* HAS_FLIGHT */
+		if (main_deploy >= 0)
+			link.printf("c m %d\n", main_deploy);
+		if (apogee_delay >= 0)
+			link.printf("c d %d\n", apogee_delay);
+		if (apogee_lockout >= 0)
+			link.printf("c L %d\n", apogee_lockout);
+
+		/* Don't mess with radio calibration when remote */
+		if (radio_calibration > 0 && !remote)
+			link.printf("c f %d\n", radio_calibration);
+
+		/* HAS_RADIO */
+		if (has_frequency()) {
+			boolean has_frequency = radio_frequency >= 0;
+			boolean has_setting = radio_setting > 0;
+			double frequency = frequency();
+			link.set_radio_frequency(frequency,
+							has_frequency,
+							has_setting,
+							radio_calibration);
+			/* When remote, reset the dongle frequency at the same time */
+			if (remote) {
+				link.stop_remote();
+				link.set_radio_frequency(frequency);
+				link.start_remote();
+			}
+		}
+
+		if (callsign != null)
+			link.printf("c c %s\n", callsign);
+		if (radio_enable >= 0)
+			link.printf("c e %d\n", radio_enable);
+
+		/* HAS_ACCEL */
+		/* UI doesn't support accel cal */
+		if (pad_orientation >= 0)
+			link.printf("c o %d\n", pad_orientation);
+
+		/* HAS_LOG */
+		if (flight_log_max != 0)
+			link.printf("c l %d\n", flight_log_max);
+
+		/* HAS_IGNITE */
+		if (ignite_mode >= 0)
+			link.printf("c i %d\n", ignite_mode);
+
+		/* HAS_AES */
+		/* UI doesn't support AES key config */
+
+		/* AO_PYRO_NUM */
+		if (pyros.length > 0) {
+			for (int p = 0; p < pyros.length; p++) {
+				link.printf("c P %s\n",
+						   pyros[p].toString());
+			}
+		}
+
+		link.printf("c w\n");
+		link.flush_output();
+	}
+
 	public AltosConfigData(AltosLink link) throws InterruptedException, TimeoutException {
 		reset();
 		link.printf("c s\nf\nv\n");
diff --git a/altoslib/AltosConfigValues.java b/altoslib/AltosConfigValues.java
new file mode 100644
index 00000000..69239f21
--- /dev/null
+++ b/altoslib/AltosConfigValues.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.AltosLib;
+
+public interface AltosConfigValues {
+	/* set and get all of the dialog values */
+	public abstract void set_product(String product);
+
+	public abstract void set_version(String version);
+
+	public abstract void set_serial(int serial);
+
+	public abstract void set_main_deploy(int new_main_deploy);
+
+	public abstract int main_deploy();
+
+	public abstract void set_apogee_delay(int new_apogee_delay);
+
+	public abstract int apogee_delay();
+
+	public abstract void set_apogee_lockout(int new_apogee_lockout);
+
+	public abstract int apogee_lockout();
+
+	public abstract void set_radio_frequency(double new_radio_frequency);
+
+	public abstract double radio_frequency();
+
+	public abstract void set_radio_calibration(int new_radio_calibration);
+
+	public abstract int radio_calibration();
+
+	public abstract void set_radio_enable(int new_radio_enable);
+
+	public abstract int radio_enable();
+
+	public abstract void set_callsign(String new_callsign);
+
+	public abstract String callsign();
+
+	public abstract void set_flight_log_max(int new_flight_log_max);
+
+	public abstract void set_flight_log_max_enabled(boolean enable);
+
+	public abstract int flight_log_max();
+
+	public abstract void set_flight_log_max_limit(int flight_log_max_limit);
+
+	public abstract void set_ignite_mode(int new_ignite_mode);
+
+	public abstract int ignite_mode();
+
+	public abstract void set_pad_orientation(int new_pad_orientation);
+
+	public abstract int pad_orientation();
+
+	public abstract void set_pyros(AltosPyro[] new_pyros);
+
+	public abstract AltosPyro[] pyros();
+}
diff --git a/altoslib/Makefile.am b/altoslib/Makefile.am
index 2579a650..0086bc65 100644
--- a/altoslib/Makefile.am
+++ b/altoslib/Makefile.am
@@ -12,6 +12,7 @@ AltosLibdir = $(datadir)/java
 AltosLib_JAVA = \
 	$(SRC)/AltosLib.java \
 	$(SRC)/AltosConfigData.java \
+	$(SRC)/AltosConfigValues.java \
 	$(SRC)/AltosConvert.java \
 	$(SRC)/AltosCRCException.java \
 	$(SRC)/AltosEepromChunk.java \