*/
package org.altusmetrum.micropeak;
+
import java.util.*;
import java.io.*;
import libaltosJNI.*;
+import org.altusmetrum.altosuilib_1.*;
public class MicroSerial extends InputStream {
SWIGTYPE_p_altos_file file;
public int read() {
int c = libaltos.altos_getchar(file, 0);
- if (MicroPreferences.serial_debug)
+ if (Thread.interrupted())
+ return -1;
+ if (c == -1)
+ return -1;
+ if (AltosUIPreferences.serial_debug)
System.out.printf("%c", c);
return c;
}
}
}
- public MicroSerial(MicroUSB usb) throws FileNotFoundException {
- file = usb.open();
+ public MicroSerial(AltosDevice device) throws FileNotFoundException {
+ file = device.open();
if (file == null) {
- final String message = usb.getErrorString();
+ final String message = device.getErrorString();
throw new FileNotFoundException(String.format("%s (%s)",
- usb.toShortString(),
+ device.toShortString(),
message));
}
}