altos/altosui: Add pad orientation configure option

[fw/altos] / altosui / AltosConfig.java

diff --git a/altosui/AltosConfig.java b/altosui/AltosConfig.java
index c5de83f20608cea55c17a6eb78b1d5cab3090470..04d75528c8219bcae8cf42cd00c8497d008ccc86 100644 (file)
--- 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);
@@ -224,6 +228,10 @@ 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 (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 {
@@ -306,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);
        }
@@ -340,6 +350,8 @@ 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");