projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add telescience-pwm product
[fw/altos]
/
altosui
/
AltosConfig.java
diff --git
a/altosui/AltosConfig.java
b/altosui/AltosConfig.java
index bb2665c2876eb7c1af9332614557fa47920f965e..44e5a3faf4c5265414476cbc0bc31464543c5a4a 100644
(file)
--- a/
altosui/AltosConfig.java
+++ b/
altosui/AltosConfig.java
@@
-17,18
+17,11
@@
package altosui;
package altosui;
-import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import java.awt.event.*;
import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
import java.io.*;
import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
import java.util.concurrent.*;
import java.util.concurrent.*;
-
-import libaltosJNI.*;
+import org.altusmetrum.AltosLib.*;
public class AltosConfig implements ActionListener {
public class AltosConfig implements ActionListener {
@@
-70,6
+63,7
@@
public class AltosConfig implements ActionListener {
int_ref log_format;
int_ref main_deploy;
int_ref apogee_delay;
int_ref log_format;
int_ref main_deploy;
int_ref apogee_delay;
+ int_ref apogee_lockout;
int_ref radio_channel;
int_ref radio_calibration;
int_ref flight_log_max;
int_ref radio_channel;
int_ref radio_calibration;
int_ref flight_log_max;
@@
-148,6
+142,7
@@
public class AltosConfig implements ActionListener {
config_ui.set_version(version.get());
config_ui.set_main_deploy(main_deploy.get());
config_ui.set_apogee_delay(apogee_delay.get());
config_ui.set_version(version.get());
config_ui.set_main_deploy(main_deploy.get());
config_ui.set_apogee_delay(apogee_delay.get());
+ config_ui.set_apogee_lockout(apogee_lockout.get());
config_ui.set_radio_calibration(radio_calibration.get());
config_ui.set_radio_frequency(frequency());
boolean max_enabled = true;
config_ui.set_radio_calibration(radio_calibration.get());
config_ui.set_radio_frequency(frequency());
boolean max_enabled = true;
@@
-188,6
+183,7
@@
public class AltosConfig implements ActionListener {
get_int(line, "log-format", log_format);
get_int(line, "Main deploy:", main_deploy);
get_int(line, "Apogee delay:", apogee_delay);
get_int(line, "log-format", log_format);
get_int(line, "Main deploy:", main_deploy);
get_int(line, "Apogee delay:", apogee_delay);
+ get_int(line, "Apogee lockout:", apogee_lockout);
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, "Radio channel:", radio_channel);
get_int(line, "Radio cal:", radio_calibration);
get_int(line, "Max flight log:", flight_log_max);
@@
-232,6
+228,7
@@
public class AltosConfig implements ActionListener {
log_format.set(Altos.AO_LOG_FORMAT_UNKNOWN);
main_deploy.set(250);
apogee_delay.set(0);
log_format.set(Altos.AO_LOG_FORMAT_UNKNOWN);
main_deploy.set(250);
apogee_delay.set(0);
+ apogee_lockout.set(0);
radio_channel.set(0);
radio_setting.set(0);
radio_frequency.set(0);
radio_channel.set(0);
radio_setting.set(0);
radio_frequency.set(0);
@@
-285,6
+282,7
@@
public class AltosConfig implements ActionListener {
start_serial();
serial_line.printf("c m %d\n", main_deploy.get());
serial_line.printf("c d %d\n", apogee_delay.get());
start_serial();
serial_line.printf("c m %d\n", main_deploy.get());
serial_line.printf("c d %d\n", apogee_delay.get());
+ serial_line.printf("c L %d\n", apogee_lockout.get());
if (!remote)
serial_line.printf("c f %d\n", radio_calibration.get());
serial_line.set_radio_frequency(frequency,
if (!remote)
serial_line.printf("c f %d\n", radio_calibration.get());
serial_line.set_radio_frequency(frequency,
@@
-294,7
+292,7
@@
public class AltosConfig implements ActionListener {
if (remote) {
serial_line.stop_remote();
serial_line.set_radio_frequency(frequency);
if (remote) {
serial_line.stop_remote();
serial_line.set_radio_frequency(frequency);
- AltosPreferences.set_frequency(device.getSerial(), frequency);
+ Altos
UI
Preferences.set_frequency(device.getSerial(), frequency);
serial_line.start_remote();
}
serial_line.printf("c c %s\n", callsign.get());
serial_line.start_remote();
}
serial_line.printf("c c %s\n", callsign.get());
@@
-422,6
+420,7
@@
public class AltosConfig implements ActionListener {
main_deploy.set(config_ui.main_deploy());
apogee_delay.set(config_ui.apogee_delay());
main_deploy.set(config_ui.main_deploy());
apogee_delay.set(config_ui.apogee_delay());
+ apogee_lockout.set(config_ui.apogee_lockout());
radio_calibration.set(config_ui.radio_calibration());
set_frequency(config_ui.radio_frequency());
flight_log_max.set(config_ui.flight_log_max());
radio_calibration.set(config_ui.radio_calibration());
set_frequency(config_ui.radio_frequency());
flight_log_max.set(config_ui.flight_log_max());
@@
-463,6
+462,7
@@
public class AltosConfig implements ActionListener {
log_format = new int_ref(Altos.AO_LOG_FORMAT_UNKNOWN);
main_deploy = new int_ref(250);
apogee_delay = new int_ref(0);
log_format = new int_ref(Altos.AO_LOG_FORMAT_UNKNOWN);
main_deploy = new int_ref(250);
apogee_delay = new int_ref(0);
+ apogee_lockout = new int_ref(0);
radio_channel = new int_ref(0);
radio_setting = new int_ref(0);
radio_frequency = new int_ref(0);
radio_channel = new int_ref(0);
radio_setting = new int_ref(0);
radio_frequency = new int_ref(0);
@@
-483,7
+483,7
@@
public class AltosConfig implements ActionListener {
try {
serial_line = new AltosSerial(device);
try {
try {
serial_line = new AltosSerial(device);
try {
- if (!device.matchProduct(Altos.product_
telemetrum
))
+ if (!device.matchProduct(Altos.product_
altimeter
))
remote = true;
init_ui();
} catch (InterruptedException ie) {
remote = true;
init_ui();
} catch (InterruptedException ie) {
@@
-502,11
+502,6
@@
public class AltosConfig implements ActionListener {
device.toShortString()),
"Device in use",
JOptionPane.ERROR_MESSAGE);
device.toShortString()),
"Device in use",
JOptionPane.ERROR_MESSAGE);
- } catch (IOException ee) {
- JOptionPane.showMessageDialog(owner,
- device.toShortString(),
- ee.getLocalizedMessage(),
- JOptionPane.ERROR_MESSAGE);
}
}
}
}
}
}