X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosConfig.java;h=122ebeccf88d449800286f569a84026e962a5cfb;hp=9a44c1c5a273cd42dbf8c1e181371d3cf20cf4f6;hb=c3314dae2d3df82e188daf6ba8520cce833592c6;hpb=ef7f60df841f1eb22b9cec0d7f68cf2c003d6b30

diff --git a/altosui/AltosConfig.java b/altosui/AltosConfig.java
index 9a44c1c5..122ebecc 100644
--- a/altosui/AltosConfig.java
+++ b/altosui/AltosConfig.java
@@ -78,11 +78,14 @@ public class AltosConfig implements ActionListener {
 	int_ref		radio_setting;
 	int_ref		storage_size;
 	int_ref		storage_erase_unit;
+	int_ref		stored_flight;
+	int_ref		radio_enable;
 	string_ref	version;
 	string_ref	product;
 	string_ref	callsign;
 	AltosConfigUI	config_ui;
 	boolean		serial_started;
+	boolean		made_visible;
 
 	boolean get_int(String line, String label, int_ref x) {
 		if (line.startsWith(label)) {
@@ -146,13 +149,28 @@ public class AltosConfig implements ActionListener {
 		config_ui.set_apogee_delay(apogee_delay.get());
 		config_ui.set_radio_calibration(radio_calibration.get());
 		config_ui.set_radio_frequency(frequency());
+		boolean max_enabled = true;
+		switch (log_format.get()) {
+		case Altos.AO_LOG_FORMAT_TINY:
+			max_enabled = false;
+			break;
+		default:
+			if (stored_flight.get() >= 0)
+				max_enabled = false;
+			break;
+		}
+		config_ui.set_flight_log_max_enabled(max_enabled);
+		config_ui.set_radio_enable(radio_enable.get());
 		config_ui.set_flight_log_max_limit(log_limit());
 		config_ui.set_flight_log_max(flight_log_max.get());
 		config_ui.set_ignite_mode(ignite_mode.get());
 		config_ui.set_pad_orientation(pad_orientation.get());
 		config_ui.set_callsign(callsign.get());
 		config_ui.set_clean();
-		config_ui.make_visible();
+		if (!made_visible) {
+			made_visible = true;
+			config_ui.make_visible();
+		}
 	}
 
 	void process_line(String line) {
@@ -160,7 +178,7 @@ public class AltosConfig implements ActionListener {
 			abort();
 			return;
 		}
-		if (line.equals("done")) {
+		if (line.equals("all finished")) {
 			if (serial_line != null)
 				update_ui();
 			return;
@@ -175,8 +193,10 @@ public class AltosConfig implements ActionListener {
 		get_int(line, "Ignite mode:", ignite_mode);
 		get_int(line, "Pad orientation:", pad_orientation);
 		get_int(line, "Radio setting:", radio_setting);
+		get_int(line, "Radio enable:", radio_enable);
 		get_int(line, "Storage size:", storage_size);
 		get_int(line, "Storage erase unit:", storage_erase_unit);
+		get_int(line, "flight", stored_flight);
 		get_string(line, "Callsign:", callsign);
 		get_string(line,"software-version", version);
 		get_string(line,"product", product);
@@ -203,10 +223,32 @@ public class AltosConfig implements ActionListener {
 			SwingUtilities.invokeLater(r);
 		}
 
+		void reset_data() {
+			serial.set(0);
+			log_format.set(Altos.AO_LOG_FORMAT_UNKNOWN);
+			main_deploy.set(250);
+			apogee_delay.set(0);
+			radio_channel.set(0);
+			radio_setting.set(0);
+			radio_calibration.set(1186611);
+			radio_enable.set(-1);
+			flight_log_max.set(0);
+			ignite_mode.set(-1);
+			pad_orientation.set(-1);
+			storage_size.set(-1);
+			storage_erase_unit.set(-1);
+			stored_flight.set(-1);
+			callsign.set("N0CALL");
+			version.set("unknown");
+			product.set("unknown");
+		}
+
 		void get_data() {
 			try {
 				config.start_serial();
-				config.serial_line.printf("c s\nf\nv\n");
+				reset_data();
+
+				config.serial_line.printf("c s\nf\nl\nv\n");
 				for (;;) {
 					try {
 						String line = config.serial_line.get_reply(5000);
@@ -227,7 +269,7 @@ public class AltosConfig implements ActionListener {
 				} catch (InterruptedException ie) {
 				}
 			}
-			callback("done");
+			callback("all finished");
 		}
 
 		void save_data() {
@@ -251,6 +293,8 @@ public class AltosConfig implements ActionListener {
 				serial_line.printf("c c %s\n", callsign.get());
 				if (flight_log_max.get() != 0)
 					serial_line.printf("c l %d\n", flight_log_max.get());
+				if (radio_enable.get() >= 0)
+					serial_line.printf("c e %d\n", radio_enable.get());
 				if (ignite_mode.get() >= 0)
 					serial_line.printf("c i %d\n", ignite_mode.get());
 				if (pad_orientation.get() >= 0)
@@ -369,6 +413,8 @@ public class AltosConfig implements ActionListener {
 		radio_calibration.set(config_ui.radio_calibration());
 		set_frequency(config_ui.radio_frequency());
 		flight_log_max.set(config_ui.flight_log_max());
+		if (radio_enable.get() >= 0)
+			radio_enable.set(config_ui.radio_enable());
 		if (ignite_mode.get() >= 0)
 			ignite_mode.set(config_ui.ignite_mode());
 		if (pad_orientation.get() >= 0)
@@ -408,11 +454,13 @@ public class AltosConfig implements ActionListener {
 		radio_channel = new int_ref(0);
 		radio_setting = new int_ref(0);
 		radio_calibration = new int_ref(1186611);
+		radio_enable = new int_ref(-1);
 		flight_log_max = new int_ref(0);
 		ignite_mode = new int_ref(-1);
 		pad_orientation = new int_ref(-1);
 		storage_size = new int_ref(-1);
 		storage_erase_unit = new int_ref(-1);
+		stored_flight = new int_ref(-1);
 		callsign = new string_ref("N0CALL");
 		version = new string_ref("unknown");
 		product = new string_ref("unknown");