projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telelco-v3.0: Merge info into one screen
[fw/altos]
/
altosui
/
AltosConfigFCUI.java
diff --git
a/altosui/AltosConfigFCUI.java
b/altosui/AltosConfigFCUI.java
index 3e5bede5169718a291533600d878fe50589a86fc..9d39cda1bf820e0c898b8a3b1d5633881c57b5f2 100644
(file)
--- a/
altosui/AltosConfigFCUI.java
+++ b/
altosui/AltosConfigFCUI.java
@@
-123,13
+123,6
@@
public class AltosConfigFCUI
"0", "5", "10", "15", "20"
};
"0", "5", "10", "15", "20"
};
- static String[] ignite_mode_values = {
- "Dual Deploy",
- "Redundant Apogee",
- "Redundant Main",
- "Separation & Apogee",
- };
-
static String[] aprs_interval_values = {
"Disabled",
"2",
static String[] aprs_interval_values = {
"Disabled",
"2",
@@
-154,16
+147,6
@@
public class AltosConfigFCUI
"4250",
};
"4250",
};
- static String[] pad_orientation_values_radio = {
- "Antenna Up",
- "Antenna Down",
- };
-
- static String[] pad_orientation_values_no_radio = {
- "Beeper Up",
- "Beeper Down",
- };
-
String[] pad_orientation_values;
static String[] tracker_motion_values_m = {
String[] pad_orientation_values;
static String[] tracker_motion_values_m = {
@@
-328,11
+311,7
@@
public class AltosConfigFCUI
}
void set_pad_orientation_values() {
}
void set_pad_orientation_values() {
- String [] new_values;
- if (has_radio())
- new_values = pad_orientation_values_radio;
- else
- new_values = pad_orientation_values_no_radio;
+ String [] new_values = AltosLib.pad_orientation_values(has_radio());
if (new_values != pad_orientation_values) {
int id = pad_orientation_value.getSelectedIndex();
pad_orientation_value.removeAllItems();
if (new_values != pad_orientation_values) {
int id = pad_orientation_value.getSelectedIndex();
pad_orientation_value.removeAllItems();
@@
-893,7
+872,7
@@
public class AltosConfigFCUI
c.anchor = GridBagConstraints.LINE_START;
c.insets = ir;
c.ipady = 5;
c.anchor = GridBagConstraints.LINE_START;
c.insets = ir;
c.ipady = 5;
- ignite_mode_value = new JComboBox<String>(ignite_mode_values);
+ ignite_mode_value = new JComboBox<String>(
AltosLib.
ignite_mode_values);
ignite_mode_value.setEditable(false);
ignite_mode_value.addItemListener(this);
pane.add(ignite_mode_value, c);
ignite_mode_value.setEditable(false);
ignite_mode_value.addItemListener(this);
pane.add(ignite_mode_value, c);
@@
-919,7
+898,7
@@
public class AltosConfigFCUI
c.anchor = GridBagConstraints.LINE_START;
c.insets = ir;
c.ipady = 5;
c.anchor = GridBagConstraints.LINE_START;
c.insets = ir;
c.ipady = 5;
- pad_orientation_values =
pad_orientation_values_no_radio
;
+ pad_orientation_values =
AltosLib.pad_orientation_values(false)
;
pad_orientation_value = new JComboBox<String>(pad_orientation_values);
pad_orientation_value.setEditable(false);
pad_orientation_value = new JComboBox<String>(pad_orientation_values);
pad_orientation_value.setEditable(false);
@@
-1453,7
+1432,7
@@
public class AltosConfigFCUI
public void set_ignite_mode(int new_ignite_mode) {
if (new_ignite_mode != AltosLib.MISSING) {
public void set_ignite_mode(int new_ignite_mode) {
if (new_ignite_mode != AltosLib.MISSING) {
- if (new_ignite_mode >= ignite_mode_values.length)
+ if (new_ignite_mode >=
AltosLib.
ignite_mode_values.length)
new_ignite_mode = 0;
if (new_ignite_mode < 0) {
ignite_mode_value.setEnabled(false);
new_ignite_mode = 0;
if (new_ignite_mode < 0) {
ignite_mode_value.setEnabled(false);