X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosConfigData.java;h=272dd402aaae4713d134f4fc24c75e907079fa4a;hb=f4ea46dc205454411c224ada7805f813989efd4a;hp=3f0e9af3f31869b921884a3e98041b9469123132;hpb=f7cd8317bf78ece334e1ceb0263b875ca43bbbd2;p=fw%2Faltos

diff --git a/altosui/AltosConfigData.java b/altosui/AltosConfigData.java
index 3f0e9af3..272dd402 100644
--- a/altosui/AltosConfigData.java
+++ b/altosui/AltosConfigData.java
@@ -36,6 +36,7 @@ public class AltosConfigData implements Iterable<String> {
 	String	manufacturer;
 	String	product;
 	String	version;
+	int	log_format;
 	int	serial;
 
 	/* Strings returned */
@@ -47,12 +48,14 @@ public class AltosConfigData implements Iterable<String> {
 	int	main_deploy;
 	int	apogee_delay;
 	int	radio_channel;
+	int	radio_setting;
 	String	callsign;
 	int	accel_cal_plus, accel_cal_minus;
 	int	radio_calibration;
 	int	flight_log_max;
 	int	ignite_mode;
-
+	int	storage_size;
+	int	storage_erase_unit;
 
 	static String get_string(String line, String label) throws  ParseException {
 		if (line.startsWith(label)) {
@@ -82,19 +85,31 @@ public class AltosConfigData implements Iterable<String> {
 	}
 
 	public AltosConfigData(AltosSerial serial_line) throws InterruptedException, TimeoutException {
-		serial_line.printf("c s\nv\n");
+		serial_line.printf("c s\nf\nv\n");
 		lines = new LinkedList<String>();
+		radio_setting = 0;
 		for (;;) {
-			String line = serial_line.get_reply(5000);
+			String line = serial_line.get_reply();
 			if (line == null)
 				throw new TimeoutException();
 			if (line.contains("Syntax error"))
 				continue;
 			lines.add(line);
 			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 {
+				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) {}
@@ -102,6 +117,9 @@ 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 { storage_size = get_int(line, "Storage size:"); } catch (Exception e) {}
+			try { storage_erase_unit = get_int(line, "Storage erase unit"); } catch (Exception e) {}
+
 			/* signals the end of the version info */
 			if (line.startsWith("software-version"))
 				break;