rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-26 20:54:22 +01:00
Code Issues Releases Activity

Serial UTF-8 decoder now handles blocks of 16Kb at a time

Browse Source
This commit is contained in:
Cristian Maglie 2020-06-19 16:05:56 +02:00
parent 2162966924
commit 618eef0e0d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arduino-core/src/processing/app/Serial.java
View File

@ -54,6 +54,7 @@ public class Serial implements SerialPortEventListener {
private PipedOutputStream decoderInRaw; private PipedOutputStream decoderInRaw;
private InputStreamReader decoderOutputUTF8; private InputStreamReader decoderOutputUTF8;
private final int DECODER_BUFF_SIZE = 16384;
public Serial() throws SerialException { public Serial() throws SerialException {
this(PreferencesData.get("serial.port"), this(PreferencesData.get("serial.port"),
@ -186,10 +187,10 @@ public class Serial implements SerialPortEventListener {
public void processSerialEvent(byte[] buf) { public void processSerialEvent(byte[] buf) {
int next = 0; int next = 0;
int max = buf.length; int max = buf.length;
char chars[] = new char[512]; char chars[] = new char[DECODER_BUFF_SIZE];
try { try {
while (next < max) { while (next < max) {
int w = Integer.min(max - next, 128); int w = Integer.min(max - next, chars.length);
decoderInRaw.write(buf, next, w); decoderInRaw.write(buf, next, w);
next += w; next += w;
int n = decoderOutputUTF8.read(chars); int n = decoderOutputUTF8.read(chars);
@ -269,7 +270,8 @@ public class Serial implements SerialPortEventListener {
public synchronized void resetDecoding(Charset charset) { public synchronized void resetDecoding(Charset charset) {
try { try {
decoderInRaw = new PipedOutputStream(); decoderInRaw = new PipedOutputStream();
decoderOutputUTF8 = new InputStreamReader(new PipedInputStream(decoderInRaw), charset); // add 16 extra bytes to make room for incomplete UTF-8 chars
decoderOutputUTF8 = new InputStreamReader(new PipedInputStream(decoderInRaw, DECODER_BUFF_SIZE + 16), charset);
} catch (IOException e) { } catch (IOException e) {
// Should never happen... // Should never happen...
e.printStackTrace(); e.printStackTrace();