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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Joe Wegner 2019-09-27 09:42:56 -04:00
commit 09e420245b
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/processing/app/SerialPlotter.java
View File

@ -289,6 +289,10 @@ public class SerialPlotter extends AbstractMonitor {
messageBuffer.delete(0, linebreak + 1); messageBuffer.delete(0, linebreak + 1);
line = line.trim(); line = line.trim();
if (line.length() == 0) {
// the line only contained trimmable characters
continue;
}
String[] parts = line.split("[, \t]+"); String[] parts = line.split("[, \t]+");
if(parts.length == 0) { if(parts.length == 0) {
continue; continue;

4
arduino-core/src/processing/app/BaseNoGui.java
View File

@ -41,9 +41,9 @@ import static processing.app.helpers.filefilters.OnlyDirs.ONLY_DIRS;
public class BaseNoGui { public class BaseNoGui {
/** Version string to be used for build */ /** Version string to be used for build */
public static final int REVISION = 10810; public static final int REVISION = 10811;
/** Extended version string displayed on GUI */ /** Extended version string displayed on GUI */
public static final String VERSION_NAME = "1.8.10"; public static final String VERSION_NAME = "1.8.11";
public static final String VERSION_NAME_LONG; public static final String VERSION_NAME_LONG;
// Current directory to use for relative paths specified on the // Current directory to use for relative paths specified on the

2
build/linux/dist/install.sh vendored
View File

@ -29,7 +29,7 @@ xdg_install_f() {
TMP_DIR=`mktemp --directory` TMP_DIR=`mktemp --directory`
# Create *.desktop file using the existing template file # Create *.desktop file using the existing template file
sed -e "s,<BINARY_LOCATION>,${SCRIPT_PATH}/arduino,g" \ sed -e "s,<BINARY_LOCATION>,\"${SCRIPT_PATH}/arduino\",g" \
-e "s,<ICON_NAME>,${RESOURCE_NAME},g" "${SCRIPT_PATH}/lib/desktop.template" > "${TMP_DIR}/${RESOURCE_NAME}.desktop" -e "s,<ICON_NAME>,${RESOURCE_NAME},g" "${SCRIPT_PATH}/lib/desktop.template" > "${TMP_DIR}/${RESOURCE_NAME}.desktop"
# Install the icon files using name and resolutions # Install the icon files using name and resolutions

3
build/shared/revisions.txt
View File

@ -1,3 +1,6 @@
ARDUINO 1.8.11 ????
ARDUINO 1.8.10 2019.09.13 ARDUINO 1.8.10 2019.09.13
[ide] [ide]