X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosConfig.java;h=04d75528c8219bcae8cf42cd00c8497d008ccc86;hb=ba5dc35388d28c5769eaabc970c4d4b8c2c2ff9c;hp=854d5384620e34e0655188d002aa9a27704678e8;hpb=97517ee585462c2d355f23f999fb8d9ebd908ec1;p=fw%2Faltos

diff --git a/altosui/AltosConfig.java b/altosui/AltosConfig.java
index 854d5384..04d75528 100644
--- a/altosui/AltosConfig.java
+++ b/altosui/AltosConfig.java
@@ -70,6 +70,8 @@ public class AltosConfig implements ActionListener {
 	int_ref		radio_channel;
 	int_ref		radio_calibration;
 	int_ref		flight_log_max;
+	int_ref		ignite_mode;
+	int_ref		pad_orientation;
 	string_ref	version;
 	string_ref	product;
 	string_ref	callsign;
@@ -130,6 +132,8 @@ public class AltosConfig implements ActionListener {
 		config_ui.set_radio_channel(radio_channel.get());
 		config_ui.set_radio_calibration(radio_calibration.get());
 		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();
@@ -137,12 +141,10 @@ public class AltosConfig implements ActionListener {
 
 	void process_line(String line) {
 		if (line == null) {
-			System.out.printf("timeout\n");
 			abort();
 			return;
 		}
 		if (line.equals("done")) {
-			System.out.printf("done\n");
 			if (serial_line != null)
 				update_ui();
 			return;
@@ -153,6 +155,8 @@ public class AltosConfig implements ActionListener {
 		get_int(line, "Radio channel:", radio_channel);
 		get_int(line, "Radio cal:", radio_calibration);
 		get_int(line, "Max flight log:", flight_log_max);
+		get_int(line, "Ignite mode:", ignite_mode);
+		get_int(line, "Pad orientation:", pad_orientation);
 		get_string(line, "Callsign:", callsign);
 		get_string(line,"software-version", version);
 		get_string(line,"product", product);
@@ -207,16 +211,27 @@ public class AltosConfig implements ActionListener {
 
 		void save_data() {
 			try {
+				int	channel;
 				start_serial();
 				serial_line.printf("c m %d\n", main_deploy.get());
 				serial_line.printf("c d %d\n", apogee_delay.get());
-				if (!remote) {
-					serial_line.printf("c r %d\n", radio_channel.get());
-					serial_line.printf("c f %d\n", radio_calibration.get());
+				channel = radio_channel.get();
+				serial_line.printf("c r %d\n", channel);
+				if (remote) {
+					serial_line.stop_remote();
+					serial_line.set_channel(channel);
+					AltosPreferences.set_channel(device.getSerial(), channel);
+					serial_line.start_remote();
 				}
+				if (!remote)
+					serial_line.printf("c f %d\n", radio_calibration.get());
 				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 (ignite_mode.get() >= 0)
+					serial_line.printf("c i %d\n", ignite_mode.get());
+				if (pad_orientation.get() >= 0)
+					serial_line.printf("c o %d\n", pad_orientation.get());
 				serial_line.printf("c w\n");
 			} catch (InterruptedException ie) {
 			} finally {
@@ -299,6 +314,8 @@ public class AltosConfig implements ActionListener {
 		radio_channel.set(config_ui.radio_channel());
 		radio_calibration.set(config_ui.radio_calibration());
 		flight_log_max.set(config_ui.flight_log_max());
+		ignite_mode.set(config_ui.ignite_mode());
+		pad_orientation.set(config_ui.pad_orientation());
 		callsign.set(config_ui.callsign());
 		run_serial_thread(serial_mode_save);
 	}
@@ -333,15 +350,17 @@ public class AltosConfig implements ActionListener {
 		radio_channel = new int_ref(0);
 		radio_calibration = new int_ref(1186611);
 		flight_log_max = new int_ref(0);
+		ignite_mode = new int_ref(-1);
+		pad_orientation = new int_ref(-1);
 		callsign = new string_ref("N0CALL");
 		version = new string_ref("unknown");
 		product = new string_ref("unknown");
 
-		device = AltosDeviceDialog.show(owner, AltosDevice.product_any);
+		device = AltosDeviceDialog.show(owner, Altos.product_any);
 		if (device != null) {
 			try {
 				serial_line = new AltosSerial(device);
-				if (!device.matchProduct(AltosDevice.product_telemetrum))
+				if (!device.matchProduct(Altos.product_telemetrum))
 					remote = true;
 				try {
 					init_ui();