X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosConfigData.java;h=b6475bb33fd9f12ae074aec0ec63d37e8f9be542;hp=ddc49e88c5e1c1b0ad1ab3acb66697ebfdde81fc;hb=55db3b3e8addaa2dc0af50470d3bc8c25cb57df3;hpb=16fd9009d8b034fd8d208115317f65fabe10072a

diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java
index ddc49e88..b6475bb3 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;
+package org.altusmetrum.altoslib_9;
 
 import java.util.*;
 import java.text.*;
@@ -29,7 +29,9 @@ public class AltosConfigData implements Iterable<String> {
 	public int	serial;
 	public int	flight;
 	public int	log_format;
+	public int	log_space;
 	public String	version;
+	public int	altitude_32;
 
 	/* Strings returned */
 	public LinkedList<String>	lines;
@@ -39,12 +41,13 @@ 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;
 	public int	radio_enable;
 	public int	radio_calibration;
+	public int	telemetry_rate;
 	/* Old HAS_RADIO values */
 	public int	radio_channel;
 	public int	radio_setting;
@@ -55,6 +58,7 @@ public class AltosConfigData implements Iterable<String> {
 
 	/* HAS_LOG */
 	public int	flight_log_max;
+	public int 	log_fixed;
 
 	/* HAS_IGNITE */
 	public int	ignite_mode;
@@ -66,6 +70,15 @@ 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;
+	public int		aprs_format;
+
+	/* HAS_BEEP */
+	public int		beep;
 
 	/* Storage info replies */
 	public int	storage_size;
@@ -74,6 +87,23 @@ public class AltosConfigData implements Iterable<String> {
 	/* Log listing replies */
 	public int	stored_flight;
 
+	/* HAS_TRACKER */
+	public int	tracker_motion;
+	public int	tracker_interval;
+
+	/* HAS_GYRO */
+	public int	accel_zero_along, accel_zero_across, accel_zero_through;
+
+	/* ms5607 data */
+	public int	ms5607_reserved;
+	public int	ms5607_sens;
+	public int	ms5607_off;
+	public int	ms5607_tcs;
+	public int	ms5607_tco;
+	public int	ms5607_tref;
+	public int	ms5607_tempsens;
+	public int	ms5607_crc;
+
 	public static String get_string(String line, String label) throws  ParseException {
 		if (line.startsWith(label)) {
 			String	quoted = line.substring(label.length()).trim();
@@ -97,10 +127,40 @@ public class AltosConfigData implements Iterable<String> {
 		throw new ParseException("mismatch", 0);
 	}
 
+	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[]	values = new int[2];
+				values[0] = Integer.parseInt(tokens[0]);
+				values[1] = Integer.parseInt(tokens[1]);
+				return values;
+			}
+		}
+		throw new ParseException("mismatch", 0);
+	}
+
 	public Iterator<String> iterator() {
 		return lines.iterator();
 	}
 
+	public int log_space() {
+		if (log_space > 0)
+			return log_space;
+
+		if (storage_size > 0) {
+			int	space = storage_size;
+
+			if (storage_erase_unit > 0 && use_flash_for_config())
+				space -= storage_erase_unit;
+
+			if (space > 0)
+				return space;
+		}
+		return 0;
+	}
+
 	public int log_available() {
 		switch (log_format) {
 		case AltosLib.AO_LOG_FORMAT_TINY:
@@ -113,15 +173,31 @@ public class AltosConfigData implements Iterable<String> {
 		default:
 			if (flight_log_max <= 0)
 				return 1;
-			int	log_space = storage_size - storage_erase_unit;
-			int	log_used = stored_flight * flight_log_max;
+			int	log_max = flight_log_max * 1024;
+			int	log_space = log_space();
+			int	log_used;
+
+			if (stored_flight <= 0)
+				log_used = 0;
+			else
+				log_used = stored_flight * log_max;
+			int	log_avail;
 
 			if (log_used >= log_space)
-				return 0;
-			return (log_space - log_used) / flight_log_max;
+				log_avail = 0;
+			else
+				log_avail = (log_space - log_used) / log_max;
+
+			return log_avail;
 		}
 	}
 
+	public boolean has_monitor_battery() {
+		if (product.startsWith("TeleBT"))
+			return true;
+		return false;
+	}
+
 	int[] parse_version(String v) {
 		String[] parts = v.split("\\.");
 		int r[] = new int[parts.length];
@@ -136,7 +212,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);
@@ -163,24 +239,27 @@ public class AltosConfigData implements Iterable<String> {
 		serial = 0;
 		flight = 0;
 		log_format = AltosLib.AO_LOG_FORMAT_UNKNOWN;
+		log_space = -1;
 		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;
+		telemetry_rate = -1;
 
 		accel_cal_plus = -1;
 		accel_cal_minus = -1;
 		pad_orientation = -1;
 
-		flight_log_max = 0;
+		flight_log_max = -1;
+		log_fixed = -1;
 		ignite_mode = -1;
 
 		aes_key = "";
@@ -188,12 +267,26 @@ public class AltosConfigData implements Iterable<String> {
 		pyro = 0;
 		npyro = 0;
 		pyros = null;
+		pyro_firing_time = -1;
+
+		aprs_interval = -1;
+		aprs_ssid = -1;
+		aprs_format = -1;
+
+		beep = -1;
+
+		tracker_motion = -1;
+		tracker_interval = -1;
 
 		storage_size = -1;
 		storage_erase_unit = -1;
-		stored_flight = -1;
+		stored_flight = 0;
+
+		accel_zero_along = -1;
+		accel_zero_across = -1;
+		accel_zero_through = -1;
 	}
-	
+
 	public void parse_line(String line) {
 		lines.add(line);
 		/* Version replies */
@@ -202,10 +295,21 @@ public class AltosConfigData implements Iterable<String> {
 		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 { 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 */
 
+		try { ms5607_reserved = get_int(line, "ms5607 reserved:"); } catch (Exception e) {}
+		try { ms5607_sens = get_int(line, "ms5607 sens:"); } catch (Exception e) {}
+		try { ms5607_off = get_int(line, "ms5607 off:"); } catch (Exception e) {}
+		try { ms5607_tcs = get_int(line, "ms5607 tcs:"); } catch (Exception e) {}
+		try { ms5607_tco = get_int(line, "ms5607 tco:"); } catch (Exception e) {}
+		try { ms5607_tref = get_int(line, "ms5607 tref:"); } catch (Exception e) {}
+		try { ms5607_tempsens = get_int(line, "ms5607 tempsens:"); } catch (Exception e) {}
+		try { ms5607_crc = get_int(line, "ms5607 crc:"); } catch (Exception e) {}
+
 		/* Config show replies */
 
 		/* HAS_FLIGHT */
@@ -222,6 +326,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) {}
@@ -241,6 +346,7 @@ public class AltosConfigData implements Iterable<String> {
 
 		/* HAS_LOG */
 		try { flight_log_max = get_int(line, "Max flight log:"); } catch (Exception e) {}
+		try { log_fixed = get_int(line, "Log fixed:"); } catch (Exception e) {}
 
 		/* HAS_IGNITE */
 		try { ignite_mode = get_int(line, "Ignite mode:"); } catch (Exception e) {}
@@ -257,17 +363,45 @@ 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) {}
 		}
-		
+		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) {}
+		try { aprs_format = get_int(line, "APRS format:"); } catch (Exception e) {}
+
+		/* HAS_BEEP */
+		try { beep = get_int(line, "Beeper setting:"); } catch (Exception e) {}
+
+		/* HAS_TRACKER */
+		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) {}
-		try { storage_erase_unit = get_int(line, "Storage erase unit"); } 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) {}
+
+		/* HAS_GYRO */
+		try {
+			if (line.startsWith("IMU call along")) {
+				String[] bits = line.split("\\s+");
+				if (bits.length >= 8) {
+					accel_zero_along = Integer.parseInt(bits[3]);
+					accel_zero_across = Integer.parseInt(bits[5]);
+					accel_zero_through = Integer.parseInt(bits[7]);
+				}
+			}
+		} catch (Exception e) {}
 	}
 
 	public AltosConfigData() {
@@ -289,18 +423,288 @@ public class AltosConfigData implements Iterable<String> {
 		}
 	}
 
+	public boolean has_frequency() {
+		return radio_frequency >= 0 || radio_setting >= 0 || radio_channel >= 0;
+	}
+
+	public boolean has_telemetry_rate() {
+		return telemetry_rate >= 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 (radio_frequency < 0 && channel < 0 && setting < 0)
+			return -1;
+
+		if (channel < 0)
+			channel = 0;
+		if (setting < 0)
+			setting = 0;
+
+		return AltosConvert.radio_to_frequency(radio_frequency,
+						       setting,
+						       radio_calibration,
+						       channel);
+	}
+
+	boolean use_flash_for_config() {
+		if (product.startsWith("TeleMega"))
+			return false;
+		if (product.startsWith("TeleMetrum-v2"))
+			return false;
+		if (product.startsWith("EasyMega"))
+			return false;
+		return true;
+	}
+
+
+	public void get_values(AltosConfigValues source) throws AltosConfigDataException {
+
+		/* 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 (telemetry_rate >= 0)
+			telemetry_rate = source.telemetry_rate();
+
+		/* 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();
+		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();
+		if (aprs_format >= 0)
+			aprs_format = source.aprs_format();
+
+		/* HAS_BEEP */
+		if (beep >= 0)
+			beep = source.beep();
+		/* HAS_TRACKER */
+		if (tracker_motion >= 0)
+			tracker_motion = source.tracker_motion();
+		if (tracker_interval >= 0)
+			tracker_interval = source.tracker_interval();
+	}
+
+	public void set_values(AltosConfigValues dest) {
+		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)
+			max_enabled = false;
+
+		if (log_fixed > 0)
+			max_enabled = false;
+
+		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_space() / 1024);
+		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);
+		dest.set_pyro_firing_time(pyro_firing_time);
+		dest.set_aprs_interval(aprs_interval);
+		dest.set_aprs_ssid(aprs_ssid);
+		dest.set_aprs_format(aprs_format);
+		dest.set_beep(beep);
+		dest.set_tracker_motion(tracker_motion);
+		dest.set_tracker_interval(tracker_interval);
+	}
+
+	public boolean log_has_state() {
+		switch (log_format) {
+		case AltosLib.AO_LOG_FORMAT_TELEGPS:
+			return false;
+		}
+		return true;
+	}
+
+	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);
+
+		/* 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.flush_output();
+				link.stop_remote();
+				link.set_radio_frequency(frequency);
+				link.flush_output();
+				link.start_remote();
+			}
+		}
+
+		if (telemetry_rate >= 0) {
+			link.printf("c T %d\n", telemetry_rate);
+			if (remote) {
+				link.flush_output();
+				link.stop_remote();
+				link.set_telemetry_rate(telemetry_rate);
+				link.flush_output();
+				link.start_remote();
+			}
+		}
+
+		if (callsign != null) {
+			link.printf("c c %s\n", callsign);
+			if (remote) {
+				link.flush_output();
+				link.stop_remote();
+				link.set_callsign(callsign);
+				link.flush_output();
+				link.start_remote();
+			}
+		}
+
+		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 (npyro > 0) {
+			for (int p = 0; p < pyros.length; p++) {
+				link.printf("c P %s\n",
+						   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);
+		if (aprs_format >= 0)
+			link.printf("c C %d\n", aprs_format);
+
+		/* HAS_BEEP */
+		if (beep >= 0)
+			link.printf("c b %d\n", beep);
+
+		/* HAS_TRACKER */
+		if (tracker_motion >= 0 && tracker_interval >= 0)
+			link.printf("c t %d %d\n", tracker_motion, tracker_interval);
+
+		/* HAS_GYRO */
+		/* UI doesn't support accel cal */
+
+		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");
 		switch (log_format) {
-		case AltosLib.AO_LOG_FORMAT_TELEMETRY:
-		case AltosLib.AO_LOG_FORMAT_TELESCIENCE:
+		case AltosLib.AO_LOG_FORMAT_UNKNOWN:
+		case AltosLib.AO_LOG_FORMAT_NONE:
 			break;
 		default:
 			link.printf("l\n");
 			read_link(link, "done");
+			break;
 		}
 	}
 
-}
\ No newline at end of file
+}