projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Make sure packet mode is turned off when the connection fails
[fw/altos]
/
ao-tools
/
altosui
/
AltosIgnite.java
diff --git
a/ao-tools/altosui/AltosIgnite.java
b/ao-tools/altosui/AltosIgnite.java
index 75c0a17a9bb0fb8bfec7cdbf8ced2d4d050ce956..3cbd8a751e1e53af63fa54c4de70ffcc3b0bab80 100644
(file)
--- a/
ao-tools/altosui/AltosIgnite.java
+++ b/
ao-tools/altosui/AltosIgnite.java
@@
-24,6
+24,7
@@
public class AltosIgnite {
AltosDevice device;
AltosSerial serial;
boolean remote;
AltosDevice device;
AltosSerial serial;
boolean remote;
+ boolean serial_started;
final static int None = 0;
final static int Apogee = 1;
final static int Main = 2;
final static int None = 0;
final static int Apogee = 1;
final static int Main = 2;
@@
-34,6
+35,7
@@
public class AltosIgnite {
final static int Open = 3;
private void start_serial() throws InterruptedException {
final static int Open = 3;
private void start_serial() throws InterruptedException {
+ serial_started = true;
if (remote) {
serial.set_radio();
serial.printf("p\nE 0\n");
if (remote) {
serial.set_radio();
serial.printf("p\nE 0\n");
@@
-42,6
+44,9
@@
public class AltosIgnite {
}
private void stop_serial() throws InterruptedException {
}
private void stop_serial() throws InterruptedException {
+ if (!serial_started)
+ return;
+ serial_started = false;
if (serial == null)
return;
if (remote) {
if (serial == null)
return;
if (remote) {
@@
-148,6
+153,10
@@
public class AltosIgnite {
}
public void close() {
}
public void close() {
+ try {
+ stop_serial();
+ } catch (InterruptedException ie) {
+ }
serial.close();
serial = null;
}
serial.close();
serial = null;
}