projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Package TeleDongle-v3.0 firmware with TeleGPS and AltosUI apps
[fw/altos]
/
altosui
/
AltosConfigTD.java
diff --git
a/altosui/AltosConfigTD.java
b/altosui/AltosConfigTD.java
index 397ed3db05b5e38a343353528e5a43dc8e784a85..9020ed9ddc874f0d652c39aa491a74b641c2ceb2 100644
(file)
--- a/
altosui/AltosConfigTD.java
+++ b/
altosui/AltosConfigTD.java
@@
-183,14
+183,12
@@
public class AltosConfigTD implements ActionListener {
}
synchronized int telemetry_rate() {
}
synchronized int telemetry_rate() {
- System.out.printf("telemetry_rate: %d\n", telemetry_rate.get());
return telemetry_rate.get();
}
synchronized void set_telemetry_rate(int new_telemetry_rate){
int rate = telemetry_rate.get();
return telemetry_rate.get();
}
synchronized void set_telemetry_rate(int new_telemetry_rate){
int rate = telemetry_rate.get();
- System.out.printf("set_telemetry_rate %d\n", new_telemetry_rate);
if (rate >= 0)
telemetry_rate.set(new_telemetry_rate);
}
if (rate >= 0)
telemetry_rate.set(new_telemetry_rate);
}
@@
-225,8
+223,10
@@
public class AltosConfigTD implements ActionListener {
if (!config_version.get().equals("0.0"))
break;
been_there = true;
if (!config_version.get().equals("0.0"))
break;
been_there = true;
- config.serial_line.printf("C\n ");
- config.serial_line.flush_input();
+ if (config != null && config.serial_line != null) {
+ config.serial_line.printf("C\n ");
+ config.serial_line.flush_input();
+ }
}
} catch (InterruptedException ie) {
}
}
} catch (InterruptedException ie) {
}
@@
-279,8
+279,10
@@
public class AltosConfigTD implements ActionListener {
}
void abort() {
}
void abort() {
- serial_line.close();
- serial_line = null;
+ if (serial_line != null) {
+ serial_line.close();
+ serial_line = null;
+ }
JOptionPane.showMessageDialog(owner,
String.format("Connection to \"%s\" failed",
device.toShortString()),
JOptionPane.showMessageDialog(owner,
String.format("Connection to \"%s\" failed",
device.toShortString()),