diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-05-06 18:13:12 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-05-06 18:13:12 -0600 |
| commit | 4c20fdfa543059739b756171b991d430789cded1 (patch) | |
| tree | f39e6c729364211bf0570c459c37b576ecf9faa9 /altoslib/AltosLink.java | |
| parent | e58dd78bcb749315f84168c83a74cf80851bf815 (diff) | |
| parent | 2f0c977c747824d0798550ac64eceb1d66c50efd (diff) | |
Merge branch 'branch-1.6' into debian
Diffstat (limited to 'altoslib/AltosLink.java')
| -rw-r--r-- | altoslib/AltosLink.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/altoslib/AltosLink.java b/altoslib/AltosLink.java index 10967417..cd8609c0 100644 --- a/altoslib/AltosLink.java +++ b/altoslib/AltosLink.java @@ -15,7 +15,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altoslib_9; +package org.altusmetrum.altoslib_10; import java.io.*; import java.util.concurrent.*; @@ -170,8 +170,8 @@ public abstract class AltosLink implements Runnable { boolean can_cancel = can_cancel_reply(); String reply = null; - if (!can_cancel && remote) - System.out.printf("Uh-oh, reading remote serial device from swing thread\n"); +// if (!can_cancel && remote) +// System.out.printf("Uh-oh, reading remote serial device from swing thread\n"); if (remote && can_cancel) { timeout = 500; @@ -539,15 +539,15 @@ public abstract class AltosLink implements Runnable { if (config_data.has_monitor_battery()) { try { - String[] items = adc(); - for (int i = 0; i < items.length;) { - if (items[i].equals("batt")) { - monitor_batt = Integer.parseInt(items[i+1]); - i += 2; - continue; + String[] items = adc(); + for (int i = 0; i < items.length;) { + if (items[i].equals("batt")) { + monitor_batt = Integer.parseInt(items[i+1]); + i += 2; + continue; + } + i++; } - i++; - } } catch (TimeoutException te) { } } |