1 files changed, 346 insertions, 62 deletions

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index 45a88783..758953e2 100644
--- a/altoslib/AltosConfigData.java
+++ b/altoslib/AltosConfigData.java
@@ -26,31 +26,53 @@ public class AltosConfigData implements Iterable<String> {
 	/* Version information */
 	public String	manufacturer;
 	public String	product;
-	public String	version;
-	public int	log_format;
 	public int	serial;
+	public int	flight;
+	public int	log_format;
+	public String	version;
 
 	/* Strings returned */
 	public LinkedList<String>	lines;
 
 	/* Config information */
-	public int	config_major;
-	public int	config_minor;
+	/* HAS_FLIGHT*/
 	public int	main_deploy;
 	public int	apogee_delay;
-	public int	radio_channel;
-	public int	radio_setting;
+	public int	apogee_lockout;
+
+	/* HAS_RADIO */
 	public int	radio_frequency;
 	public String	callsign;
-	public int	accel_cal_plus, accel_cal_minus;
+	public int	radio_enable;
 	public int	radio_calibration;
+	/* Old HAS_RADIO values */
+	public int	radio_channel;
+	public int	radio_setting;
+
+	/* HAS_ACCEL */
+	public int	accel_cal_plus, accel_cal_minus;
+	public int	pad_orientation;
+
+	/* HAS_LOG */
 	public int	flight_log_max;
+
+	/* HAS_IGNITE */
 	public int	ignite_mode;
-	public int	stored_flight;
+
+	/* HAS_AES */
+	public String	aes_key;
+
+	/* AO_PYRO_NUM */
+	public AltosPyro[]	pyros;
+	public int		npyro;
+	public int		pyro;
+
+	/* Storage info replies */
 	public int	storage_size;
 	public int	storage_erase_unit;
 
-	public AltosPyro[]	pyros;
+	/* Log listing replies */
+	public int	stored_flight;
 
 	public static String get_string(String line, String label) throws  ParseException {
 		if (line.startsWith(label)) {
@@ -85,6 +107,9 @@ public class AltosConfigData implements Iterable<String> {
 			if (stored_flight == 0)
 				return 1;
 			return 0;
+		case AltosLib.AO_LOG_FORMAT_TELEMETRY:
+		case AltosLib.AO_LOG_FORMAT_TELESCIENCE:
+			return 1;
 		default:
 			if (flight_log_max <= 0)
 				return 1;
@@ -111,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);
@@ -130,71 +155,330 @@ public class AltosConfigData implements Iterable<String> {
 		return 0;
 	}
 
-	public AltosConfigData(AltosLink link) throws InterruptedException, TimeoutException {
-		link.printf("c s\nf\nl\nv\n");
+	public void reset() {
 		lines = new LinkedList<String>();
-		radio_setting = 0;
-		radio_frequency = 0;
-		stored_flight = 0;
-		serial = -1;
+
+		manufacturer = "unknown";
+		product = "unknown";
+		serial = 0;
+		flight = 0;
+		log_format = AltosLib.AO_LOG_FORMAT_UNKNOWN;
+		version = "unknown";
+
+		main_deploy = -1;
+		apogee_delay = -1;
+		apogee_lockout = -1;
+
+		radio_frequency = -1;
+		callsign = null;
+		radio_enable = -1;
+		radio_calibration = -1;
+		radio_channel = -1;
+		radio_setting = -1;
+
+		accel_cal_plus = -1;
+		accel_cal_minus = -1;
+		pad_orientation = -1;
+
+		flight_log_max = -1;
+		ignite_mode = -1;
+
+		aes_key = "";
+
+		pyro = 0;
+		npyro = 0;
 		pyros = null;
 
-		int npyro = 0;
-		int pyro = 0;
+		storage_size = -1;
+		storage_erase_unit = -1;
+		stored_flight = -1;
+	}
+
+	public void parse_line(String line) {
+		lines.add(line);
+		/* Version replies */
+		try { manufacturer = get_string(line, "manufacturer"); } catch (Exception e) {}
+		try { product = get_string(line, "product"); } catch (Exception e) {}
+		try { serial = get_int(line, "serial-number"); } catch (Exception e) {}
+		try { flight = get_int(line, "current-flight"); } catch (Exception e) {}
+		try { log_format = get_int(line, "log-format"); } catch (Exception e) {}
+		try { version = get_string(line, "software-version"); } catch (Exception e) {}
+
+		/* Version also contains MS5607 info, which we ignore here */
+
+		/* Config show replies */
+
+		/* HAS_FLIGHT */
+		try { main_deploy = get_int(line, "Main deploy:"); } catch (Exception e) {}
+		try { apogee_delay = get_int(line, "Apogee delay:"); } catch (Exception e) {}
+		try { apogee_lockout = get_int(line, "Apogee lockout:"); } catch (Exception e) {}
+
+		/* HAS_RADIO */
+		try {
+			radio_frequency = get_int(line, "Frequency:");
+			if (radio_frequency < 0)
+				radio_frequency = 434550;
+		} catch (Exception e) {}
+		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) {}
+
+		/* Old HAS_RADIO values */
+		try { radio_channel = get_int(line, "Radio channel:"); } catch (Exception e) {}
+		try { radio_setting = get_int(line, "Radio setting:"); } catch (Exception e) {}
+
+		/* HAS_ACCEL */
+		try {
+			if (line.startsWith("Accel cal")) {
+				String[] bits = line.split("\\s+");
+				if (bits.length >= 6) {
+					accel_cal_plus = Integer.parseInt(bits[3]);
+					accel_cal_minus = Integer.parseInt(bits[5]);
+				}
+			}
+		} catch (Exception e) {}
+		try { pad_orientation = get_int(line, "Pad orientation:"); } catch (Exception e) {}
+
+		/* HAS_LOG */
+		try { flight_log_max = get_int(line, "Max flight log:"); } catch (Exception e) {}
+
+		/* HAS_IGNITE */
+		try { ignite_mode = get_int(line, "Ignite mode:"); } catch (Exception e) {}
+
+		/* HAS_AES */
+		try { aes_key = get_string(line, "AES key:"); } catch (Exception e) {}
+
+		/* AO_PYRO_NUM */
+		try {
+			npyro = get_int(line, "Pyro-count:");
+			pyros = new AltosPyro[npyro];
+			pyro = 0;
+		} catch (Exception e) {}
+		if (npyro > 0) {
+			try {
+				AltosPyro p = new AltosPyro(pyro, line);
+				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) {}
+
+		/* Log listing replies */
+		try { get_int(line, "flight"); stored_flight++; }  catch (Exception e) {}
+	}
+
+	public AltosConfigData() {
+		reset();
+	}
+
+	private void read_link(AltosLink link, String finished) throws InterruptedException, TimeoutException {
 		for (;;) {
 			String line = link.get_reply();
 			if (line == null)
 				throw new TimeoutException();
 			if (line.contains("Syntax error"))
 				continue;
-			lines.add(line);
-			if (pyro < npyro - 1) {
-				if (pyros == null)
-					pyros = new AltosPyro[npyro];
-				try {
-					pyros[pyro] = new AltosPyro(pyro, line);
-				} catch (ParseException e) {
-				}
-				++pyro;
-				continue;
-			}
-			try { serial = get_int(line, "serial-number"); } catch (Exception e) {}
-			try { log_format = get_int(line, "log-format"); } catch (Exception e) {}
-			try { main_deploy = get_int(line, "Main deploy:"); } catch (Exception e) {}
-			try { apogee_delay = get_int(line, "Apogee delay:"); } catch (Exception e) {}
-			try { radio_channel = get_int(line, "Radio channel:"); } catch (Exception e) {}
-			try { radio_setting = get_int(line, "Radio setting:"); } catch (Exception e) {}
-			try {
-				radio_frequency = get_int(line, "Frequency:");
-				if (radio_frequency < 0)
-					radio_frequency = 434550;
-			} catch (Exception e) {}
-			try {
-				if (line.startsWith("Accel cal")) {
-					String[] bits = line.split("\\s+");
-					if (bits.length >= 6) {
-						accel_cal_plus = Integer.parseInt(bits[3]);
-						accel_cal_minus = Integer.parseInt(bits[5]);
-					}
-				}
-			} catch (Exception e) {}
-			try { radio_calibration = get_int(line, "Radio cal:"); } catch (Exception e) {}
-			try { flight_log_max = get_int(line, "Max flight log:"); } catch (Exception e) {}
-			try { ignite_mode = get_int(line, "Ignite mode:"); } catch (Exception e) {}
-			try { callsign = get_string(line, "Callsign:"); } catch (Exception e) {}
-			try { version = get_string(line,"software-version"); } catch (Exception e) {}
-			try { product = get_string(line,"product"); } catch (Exception e) {}
-			try { manufacturer = get_string(line,"manufacturer"); } catch (Exception e) {}
-
-			try { get_int(line, "flight"); stored_flight++; }  catch (Exception e) {}
-			try { storage_size = get_int(line, "Storage size:"); } catch (Exception e) {}
-			try { storage_erase_unit = get_int(line, "Storage erase unit"); } catch (Exception e) {}
-			try { npyro = get_int(line, "Pyro-count:"); pyro = 0; } catch (Exception e) {}
+			this.parse_line(line);
 
 			/* signals the end of the version info */
-			if (line.startsWith("software-version"))
+			if (line.startsWith(finished))
 				break;
 		}
 	}
 
+	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");
+		read_link(link, "software-version");
+		System.out.printf("Log format %d\n", log_format);
+		switch (log_format) {
+		case AltosLib.AO_LOG_FORMAT_FULL:
+		case AltosLib.AO_LOG_FORMAT_TINY:
+		case AltosLib.AO_LOG_FORMAT_MEGAMETRUM:
+			link.printf("l\n");
+			read_link(link, "done");
+		default:
+			break;
+		}
+	}
+
 }
\ No newline at end of file