summaryrefslogtreecommitdiff
path: root/altosui
diff options
context:
space:
mode:
Diffstat (limited to 'altosui')
-rw-r--r--altosui/AltosConfig.java7
-rw-r--r--altosui/AltosConfigData.java2
-rw-r--r--altosui/AltosConfigUI.java54
3 files changed, 59 insertions, 4 deletions
diff --git a/altosui/AltosConfig.java b/altosui/AltosConfig.java
index c5de83f2..e3c30d4d 100644
--- a/altosui/AltosConfig.java
+++ b/altosui/AltosConfig.java
@@ -70,6 +70,7 @@ public class AltosConfig implements ActionListener {
int_ref radio_channel;
int_ref radio_calibration;
int_ref flight_log_max;
+ int_ref ignite_mode;
string_ref version;
string_ref product;
string_ref callsign;
@@ -130,6 +131,7 @@ 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_callsign(callsign.get());
config_ui.set_clean();
config_ui.make_visible();
@@ -153,6 +155,7 @@ 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_string(line, "Callsign:", callsign);
get_string(line,"software-version", version);
get_string(line,"product", product);
@@ -224,6 +227,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 (ignite_mode.get() >= 0)
+ serial_line.printf("c i %d\n", ignite_mode.get());
serial_line.printf("c w\n");
} catch (InterruptedException ie) {
} finally {
@@ -306,6 +311,7 @@ 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());
callsign.set(config_ui.callsign());
run_serial_thread(serial_mode_save);
}
@@ -340,6 +346,7 @@ 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);
callsign = new string_ref("N0CALL");
version = new string_ref("unknown");
product = new string_ref("unknown");
diff --git a/altosui/AltosConfigData.java b/altosui/AltosConfigData.java
index 8c32ed86..3f0e9af3 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 {
@@ -96,6 +97,7 @@ public class AltosConfigData implements Iterable<String> {
try { radio_channel = get_int(line, "Radio channel:"); } 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) {}
diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java
index f835ee2e..6f635b9d 100644
--- a/altosui/AltosConfigUI.java
+++ b/altosui/AltosConfigUI.java
@@ -46,6 +46,7 @@ public class AltosConfigUI
JLabel radio_channel_label;
JLabel radio_calibration_label;
JLabel flight_log_max_label;
+ JLabel ignite_mode_label;
JLabel callsign_label;
public boolean dirty;
@@ -59,6 +60,7 @@ public class AltosConfigUI
JComboBox radio_channel_value;
JTextField radio_calibration_value;
JComboBox flight_log_max_value;
+ JComboBox ignite_mode_value;
JTextField callsign_value;
JButton save;
@@ -83,6 +85,12 @@ public class AltosConfigUI
"704", "768", "832", "896", "960",
};
+ static String[] ignite_mode_values = {
+ "Dual Deploy",
+ "Redundant Apogee",
+ "Redundant Main",
+ };
+
static String[] radio_channel_values = new String[10];
{
for (int i = 0; i <= 9; i++)
@@ -326,9 +334,33 @@ public class AltosConfigUI
flight_log_max_value.addItemListener(this);
pane.add(flight_log_max_value, c);
- /* Buttons */
+ /* Ignite mode */
c = new GridBagConstraints();
c.gridx = 0; c.gridy = 9;
+ c.gridwidth = 4;
+ c.fill = GridBagConstraints.NONE;
+ c.anchor = GridBagConstraints.LINE_START;
+ c.insets = il;
+ c.ipady = 5;
+ ignite_mode_label = new JLabel("Igniter Firing Mode:");
+ pane.add(ignite_mode_label, c);
+
+ c = new GridBagConstraints();
+ c.gridx = 4; c.gridy = 9;
+ c.gridwidth = 4;
+ c.fill = GridBagConstraints.HORIZONTAL;
+ c.weightx = 1;
+ c.anchor = GridBagConstraints.LINE_START;
+ c.insets = ir;
+ c.ipady = 5;
+ ignite_mode_value = new JComboBox(ignite_mode_values);
+ ignite_mode_value.setEditable(false);
+ ignite_mode_value.addItemListener(this);
+ pane.add(ignite_mode_value, c);
+
+ /* Buttons */
+ c = new GridBagConstraints();
+ c.gridx = 0; c.gridy = 10;
c.gridwidth = 2;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.LINE_START;
@@ -339,7 +371,7 @@ public class AltosConfigUI
save.setActionCommand("Save");
c = new GridBagConstraints();
- c.gridx = 2; c.gridy = 9;
+ c.gridx = 2; c.gridy = 10;
c.gridwidth = 2;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.CENTER;
@@ -350,7 +382,7 @@ public class AltosConfigUI
reset.setActionCommand("Reset");
c = new GridBagConstraints();
- c.gridx = 4; c.gridy = 9;
+ c.gridx = 4; c.gridy = 10;
c.gridwidth = 2;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.CENTER;
@@ -361,7 +393,7 @@ public class AltosConfigUI
reboot.setActionCommand("Reboot");
c = new GridBagConstraints();
- c.gridx = 6; c.gridy = 9;
+ c.gridx = 6; c.gridy = 10;
c.gridwidth = 2;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.LINE_END;
@@ -499,6 +531,20 @@ public class AltosConfigUI
return Integer.parseInt(flight_log_max_value.getSelectedItem().toString());
}
+ public void set_ignite_mode(int new_ignite_mode) {
+ if (new_ignite_mode < 0) {
+ ignite_mode_value.setEnabled(false);
+ new_ignite_mode = 0;
+ } else {
+ ignite_mode_value.setEnabled(true);
+ }
+ ignite_mode_value.setSelectedItem(Integer.toString(new_ignite_mode));
+ }
+
+ public int ignite_mode() {
+ return ignite_mode_value.getSelectedIndex();
+ }
+
public void set_clean() {
dirty = false;
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-16 07:31:45 +0000