summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--altoslib/AltosIdleMonitor.java3
-rw-r--r--altoslib/AltosMs5607.java8
-rw-r--r--altosui/AltosIdleMonitorUI.java2
3 files changed, 0 insertions, 13 deletions
diff --git a/altoslib/AltosIdleMonitor.java b/altoslib/AltosIdleMonitor.java
index c816c202..d9d71143 100644
--- a/altoslib/AltosIdleMonitor.java
+++ b/altoslib/AltosIdleMonitor.java
@@ -91,14 +91,11 @@ public class AltosIdleMonitor extends Thread {
}
public void abort() throws InterruptedException {
- System.out.printf("Attempting to abort monitor thread\n");
while (isAlive()) {
- System.out.printf("Interrupting\n");
interrupt();
link.abort_reply();
Thread.sleep(100);
}
- System.out.printf("Appears to be dead now\n");
join();
}
diff --git a/altoslib/AltosMs5607.java b/altoslib/AltosMs5607.java
index 23d65ea9..2319d5b8 100644
--- a/altoslib/AltosMs5607.java
+++ b/altoslib/AltosMs5607.java
@@ -85,12 +85,10 @@ public class AltosMs5607 {
}
public boolean parse_line(String line) {
- System.out.printf ("parse %s\n", line);
String[] items = line.split("\\s+");
if (line.startsWith("Pressure:")) {
if (items.length >= 2) {
raw_pres = Integer.parseInt(items[1]);
- System.out.printf ("raw_pres %d\n", raw_pres);
}
} else if (line.startsWith("Temperature:")) {
if (items.length >= 2)
@@ -99,10 +97,8 @@ public class AltosMs5607 {
if (items.length >= 3)
reserved = Integer.parseInt(items[2]);
} else if (line.startsWith("ms5607 sens:")) {
- System.out.printf ("found sens length %d\n", items.length);
if (items.length >= 3) {
sens = Integer.parseInt(items[2]);
- System.out.printf ("sens %d\n", sens);
}
} else if (line.startsWith("ms5607 off:")) {
if (items.length >= 3)
@@ -156,13 +152,9 @@ public class AltosMs5607 {
throw new TimeoutException();
}
if (!parse_line(line)) {
- System.out.printf ("stop parsing at %s\n", line);
break;
}
}
- System.out.printf ("sens %d off %d tcs %d tco %d tref %d tempsens %d crc %d pres %d temp %d\n",
- sens, off, tcs, tco, tref, tempsens, crc, raw_pres, raw_temp);
convert();
- System.out.printf ("pa %d cc %d\n", pa, cc);
}
}
diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index 6da920e2..6a79604e 100644
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -195,13 +195,11 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
addWindowListener(new WindowAdapter() {
@Override
public void windowClosing(WindowEvent e) {
- System.out.printf("Closing idle monitor window\n");
try {
disconnect();
} catch (Exception ex) {
System.out.println(Arrays.toString(ex.getStackTrace()));
}
- System.out.printf("hiding\n");
setVisible(false);
dispose();
AltosUIPreferences.unregister_font_listener(AltosIdleMonitorUI.this);