eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-20 22:05:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

apply two patches for bufferUntil() and readBytesUntil() in Serial

Browse Source
This commit is contained in:
benfry
2008-06-09 19:12:12 +00:00
parent 29af6b606f
commit cc9a40deb7
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
serial/src/processing/serial/Serial.java
View File

@@ -211,7 +211,7 @@ public class Serial implements SerialPortEventListener {
* Set the DTR line. Addition from Tom Hulbert.
*/
public void setDTR(boolean state) {
port.setDTR(state);
port.setDTR(state);
}
@@ -227,8 +227,10 @@ public class Serial implements SerialPortEventListener {
}
buffer[bufferLast++] = (byte) input.read();
if (serialEventMethod != null) {
if ((bufferUntil && (buffer[bufferLast-1] == bufferUntilByte)) ||
((bufferLast - bufferIndex) >= bufferSize)) {
if ((bufferUntil &&
(buffer[bufferLast-1] == bufferUntilByte)) ||
(!bufferUntil &&
((bufferLast - bufferIndex) >= bufferSize))) {
try {
serialEventMethod.invoke(parent, new Object[] { this });
} catch (Exception e) {
@@ -413,8 +415,11 @@ public class Serial implements SerialPortEventListener {
byte outgoing[] = new byte[length];
System.arraycopy(buffer, bufferIndex, outgoing, 0, length);
bufferIndex = 0; // rewind
bufferLast = 0;
bufferIndex += length;
if (bufferIndex == bufferLast) {
bufferIndex = 0; // rewind
bufferLast = 0;
}
return outgoing;
}
}