Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery

Conflicts:
	app/src/processing/app/Preferences.java
	app/src/processing/app/debug/Uploader.java

1 files changed, 0 insertions, 46 deletions

diff --git a/libraries/Firmata/examples/EchoString/EchoString.ino b/libraries/Firmata/examples/EchoString/EchoString.ino
deleted file mode 100644
index 5079697..0000000
--- a/libraries/Firmata/examples/EchoString/EchoString.ino
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Firmata is a generic protocol for communicating with microcontrollers
- * from software on a host computer. It is intended to work with
- * any host computer software package.
- *
- * To download a host software package, please clink on the following link
- * to open the download page in your default browser.
- *
- * http://firmata.org/wiki/Download
- */
-
-/* This sketch accepts strings and raw sysex messages and echos them back.
- *
- * This example code is in the public domain.
- */
-#include <Firmata.h>
-
-byte analogPin;
-
-void stringCallback(char *myString)
-{
-    Firmata.sendString(myString);
-}
-
-
-void sysexCallback(byte command, byte argc, byte*argv)
-{
-    Firmata.sendSysex(command, argc, argv);
-}
-
-void setup()
-{
-    Firmata.setFirmwareVersion(0, 1);
-    Firmata.attach(STRING_DATA, stringCallback);
-    Firmata.attach(START_SYSEX, sysexCallback);
-    Firmata.begin(57600);
-}
-
-void loop()
-{
-    while(Firmata.available()) {
-        Firmata.processInput();
-    }
-}
-
-