arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-15 00:02:49 +03:00
Code Activity

Merge branch 'master' into ide-1.5.x

Browse Source 
Conflicts:
	app/src/processing/app/Serial.java
	app/src/processing/app/SerialMonitor.java
This commit is contained in:
Cristian Maglie
2014-12-23 16:25:39 +01:00
parent 588f9f1118 8e0a311e87
commit ab92e42259
6 changed files with 190 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,6 @@ import jssc.SerialPort;
import jssc.SerialPortEvent;
import jssc.SerialPortEventListener;
import jssc.SerialPortException;
import processing.app.debug.MessageConsumer;
public class Serial implements SerialPortEventListener {
@ -60,8 +59,6 @@ public class Serial implements SerialPortEventListener {
int bufferIndex;
int bufferLast;
MessageConsumer consumer;
public Serial(boolean monitor) throws SerialException {
this(PreferencesData.get("serial.port"),
PreferencesData.getInteger("serial.debug_rate"),
@ -168,10 +165,6 @@ public class Serial implements SerialPortEventListener {
}
}
public void addListener(MessageConsumer consumer) {
this.consumer = consumer;
}
public synchronized void serialEvent(SerialPortEvent serialEvent) {
if (serialEvent.isRXCHAR()) {
try {
@ -182,12 +175,12 @@ public class Serial implements SerialPortEventListener {
System.arraycopy(buffer, 0, temp, 0, bufferLast);
buffer = temp;
}
String msg = new String(buf);
if (monitor) {
System.out.print(new String(buf));
}
if (this.consumer != null) {
this.consumer.message(new String(buf));
System.out.print(msg);
}
char[] chars = msg.toCharArray();
message(chars, chars.length);
}
} catch (SerialPortException e) {
errorMessage("serialEvent", e);
@ -195,6 +188,16 @@ public class Serial implements SerialPortEventListener {
}
}
/**
* This method is intented to be extended to receive messages
* coming from serial port.
*
* @param chars
* @param length
*/
protected void message(char[] chars, int length) {
// Empty
}
/**
* Returns the number of bytes that have been read from serial