X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosConfigData.java;h=272dd402aaae4713d134f4fc24c75e907079fa4a;hb=787e4305a05e344c018abb872f788749203690d7;hp=aa7a90de08c7c234b7f123eb7c3e80c563aded26;hpb=0e3e4f9c1e6a6bf972514f12c9d622258aa2aec2;p=fw%2Faltos

diff --git a/altosui/AltosConfigData.java b/altosui/AltosConfigData.java
index aa7a90de..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 */
@@ -53,7 +54,8 @@ public class AltosConfigData implements Iterable<String> {
 	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)) {
@@ -83,8 +85,9 @@ 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();
 			if (line == null)
@@ -93,6 +96,7 @@ public class AltosConfigData implements Iterable<String> {
 				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) {}
@@ -113,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;