projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add --replay command line argument
[fw/altos]
/
ao-tools
/
altosui
/
AltosConfig.java
diff --git
a/ao-tools/altosui/AltosConfig.java
b/ao-tools/altosui/AltosConfig.java
index ac73e7c5ea88894daf6a5817e466f860a4f6b9d3..7fecff0e3de580de168117398058df8f9d3def8e 100644
(file)
--- a/
ao-tools/altosui/AltosConfig.java
+++ b/
ao-tools/altosui/AltosConfig.java
@@
-122,17
+122,17
@@
public class AltosConfig implements Runnable, ActionListener {
void start_serial() throws InterruptedException {
if (remote) {
void start_serial() throws InterruptedException {
if (remote) {
- serial_line.printf("m 0\n");
- serial_line.set_channel(AltosPreferences.channel());
+ serial_line.set_channel(AltosPreferences.channel(device.getSerial()));
serial_line.set_callsign(AltosPreferences.callsign());
serial_line.printf("p\n");
serial_line.set_callsign(AltosPreferences.callsign());
serial_line.printf("p\n");
+ serial_line.flush_input();
}
}
void stop_serial() throws InterruptedException {
if (remote) {
}
}
void stop_serial() throws InterruptedException {
if (remote) {
- serial_line.printf("~
\n
");
- serial_line.flush();
+ serial_line.printf("~");
+ serial_line.flush
_output
();
}
}
}
}
@@
-238,12
+238,12
@@
public class AltosConfig implements Runnable, ActionListener {
version = new string_ref("unknown");
product = new string_ref("unknown");
version = new string_ref("unknown");
product = new string_ref("unknown");
- device = AltosDeviceDialog.show(owner, AltosDevice.
A
ny);
+ device = AltosDeviceDialog.show(owner, AltosDevice.
product_a
ny);
serial_line = new AltosSerial();
if (device != null) {
try {
serial_line.open(device);
serial_line = new AltosSerial();
if (device != null) {
try {
serial_line.open(device);
- if (!device.matchProduct(AltosDevice.
TeleM
etrum))
+ if (!device.matchProduct(AltosDevice.
product_telem
etrum))
remote = true;
config_thread = new Thread(this);
config_thread.start();
remote = true;
config_thread = new Thread(this);
config_thread.start();