X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosConfigData.java;h=1d50ade9aeaa0a2c3ec48327537b8a3c86fb20fd;hb=11a2bb8e28df7ed87542f2ee726f877971f5d52a;hp=8c32ed86cfd2d4cb699ccde4998c486ce02e3788;hpb=bd2480fd757b67557d9c7de42e402034002c3e37;p=fw%2Faltos

diff --git a/altosui/AltosConfigData.java b/altosui/AltosConfigData.java
index 8c32ed86..1d50ade9 100644
--- a/altosui/AltosConfigData.java
+++ b/altosui/AltosConfigData.java
@@ -51,6 +51,7 @@ public class AltosConfigData implements Iterable<String> {
 	int	accel_cal_plus, accel_cal_minus;
 	int	radio_calibration;
 	int	flight_log_max;
+	int	ignite_mode;
 
 
 	static String get_string(String line, String label) throws  ParseException {
@@ -84,7 +85,7 @@ public class AltosConfigData implements Iterable<String> {
 		serial_line.printf("c s\nv\n");
 		lines = new LinkedList<String>();
 		for (;;) {
-			String line = serial_line.get_reply(5000);
+			String line = serial_line.get_reply_no_dialog(5000);
 			if (line == null)
 				throw new TimeoutException();
 			if (line.contains("Syntax error"))
@@ -94,8 +95,18 @@ public class AltosConfigData implements Iterable<String> {
 			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 {
+				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) {}