X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosConfigData.java;h=53509dfad4cafa25e2e7ac8cd24a2a65088c3612;hb=0993595035a2813deba6991fa25bc0d475f2e6bb;hp=272dd402aaae4713d134f4fc24c75e907079fa4a;hpb=ef7f60df841f1eb22b9cec0d7f68cf2c003d6b30;p=fw%2Faltos

diff --git a/altosui/AltosConfigData.java b/altosui/AltosConfigData.java
index 272dd402..53509dfa 100644
--- a/altosui/AltosConfigData.java
+++ b/altosui/AltosConfigData.java
@@ -49,11 +49,13 @@ public class AltosConfigData implements Iterable<String> {
 	int	apogee_delay;
 	int	radio_channel;
 	int	radio_setting;
+	int	radio_frequency;
 	String	callsign;
 	int	accel_cal_plus, accel_cal_minus;
 	int	radio_calibration;
 	int	flight_log_max;
 	int	ignite_mode;
+	int	stored_flight;
 	int	storage_size;
 	int	storage_erase_unit;
 
@@ -84,10 +86,63 @@ public class AltosConfigData implements Iterable<String> {
 		return lines.iterator();
 	}
 
+	public int log_available() {
+		switch (log_format) {
+		case Altos.AO_LOG_FORMAT_TINY:
+			if (stored_flight == 0)
+				return 1;
+			return 0;
+		default:
+			if (flight_log_max <= 0)
+				return 1;
+			int	log_space = storage_size - storage_erase_unit;
+			int	log_used = stored_flight * flight_log_max;
+
+			if (log_used >= log_space)
+				return 0;
+			return (log_space - log_used) / flight_log_max;
+		}
+	}
+
+	int[] parse_version(String v) {
+		String[] parts = v.split("\\.");
+		int r[] = new int[parts.length];
+
+		for (int i = 0; i < parts.length; i++) {
+			try {
+				r[i] = Altos.fromdec(parts[i]);
+			} catch (NumberFormatException n) {
+				r[i] = 0;
+			}
+		}
+
+		return r;
+	}
+	
+	public int compare_version(String other) {
+		int[]	me = parse_version(version);
+		int[]	them = parse_version(other);
+
+		int	l = Math.min(me.length, them.length);
+
+		for (int i = 0; i < l; i++) {
+			int	d = me[i] - them[i];
+			if (d != 0)
+				return d;
+		}
+		if (me.length > l)
+			return 1;
+		if (them.length > l)
+			return -1;
+		return 0;
+	}
+
 	public AltosConfigData(AltosSerial serial_line) throws InterruptedException, TimeoutException {
-		serial_line.printf("c s\nf\nv\n");
+		serial_line.printf("c s\nf\nl\nv\n");
 		lines = new LinkedList<String>();
 		radio_setting = 0;
+		radio_frequency = 0;
+		stored_flight = 0;
 		for (;;) {
 			String line = serial_line.get_reply();
 			if (line == null)
@@ -101,6 +156,11 @@ public class AltosConfigData implements Iterable<String> {
 			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+");
@@ -117,6 +177,7 @@ public class AltosConfigData implements Iterable<String> {
 			try { version = get_string(line,"software-version"); } catch (Exception e) {}
 			try { product = get_string(line,"product"); } 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) {}