projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into branch-1.6
[fw/altos]
/
altosui
/
AltosIgniteUI.java
diff --git
a/altosui/AltosIgniteUI.java
b/altosui/AltosIgniteUI.java
index 14a2b606cb2651a4db4036645ef857c587f3b569..84dc54dbe52e6d42c13843caf093e3208ed5cd75 100644
(file)
--- a/
altosui/AltosIgniteUI.java
+++ b/
altosui/AltosIgniteUI.java
@@
-24,8
+24,8
@@
import java.io.*;
import java.text.*;
import java.util.*;
import java.util.concurrent.*;
import java.text.*;
import java.util.*;
import java.util.concurrent.*;
-import org.altusmetrum.altoslib_
8
.*;
-import org.altusmetrum.altosuilib_
8
.*;
+import org.altusmetrum.altoslib_
11
.*;
+import org.altusmetrum.altosuilib_
11
.*;
public class AltosIgniteUI
extends AltosUIDialog
public class AltosIgniteUI
extends AltosUIDialog
@@
-48,6
+48,8
@@
public class AltosIgniteUI
int time_remaining;
boolean timer_running;
int time_remaining;
boolean timer_running;
+ int poll_remaining;
+
LinkedBlockingQueue<String> command_queue;
class Igniter {
LinkedBlockingQueue<String> command_queue;
class Igniter {
@@
-256,6
+258,7
@@
public class AltosIgniteUI
void set_ignite_status() {
getting_status = false;
void set_ignite_status() {
getting_status = false;
+ poll_remaining = 2;
if (!visible) {
visible = true;
setVisible(true);
if (!visible) {
visible = true;
setVisible(true);
@@
-263,6
+266,10
@@
public class AltosIgniteUI
}
void poll_ignite_status() {
}
void poll_ignite_status() {
+ if (poll_remaining > 0) {
+ --poll_remaining;
+ return;
+ }
if (!getting_status) {
getting_status = true;
send_command("get_status");
if (!getting_status) {
getting_status = true;
send_command("get_status");