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/SimpleAnalogFirmata/SimpleAnalogFirmata.ino b/libraries/Firmata/examples/SimpleAnalogFirmata/SimpleAnalogFirmata.ino
deleted file mode 100644
index 44ea91e..0000000
--- a/libraries/Firmata/examples/SimpleAnalogFirmata/SimpleAnalogFirmata.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
- */
-
-/* Supports as many analog inputs and analog PWM outputs as possible.
- *
- * This example code is in the public domain.
- */
-#include <Firmata.h>
-
-byte analogPin = 0;
-
-void analogWriteCallback(byte pin, int value)
-{
-    if (IS_PIN_PWM(pin)) {
-        pinMode(PIN_TO_DIGITAL(pin), OUTPUT);
-        analogWrite(PIN_TO_PWM(pin), value);
-    }
-}
-
-void setup()
-{
-    Firmata.setFirmwareVersion(0, 1);
-    Firmata.attach(ANALOG_MESSAGE, analogWriteCallback);
-    Firmata.begin(57600);
-}
-
-void loop()
-{
-    while(Firmata.available()) {
-        Firmata.processInput();
-    }
-    // do one analogRead per loop, so if PC is sending a lot of
-    // analog write messages, we will only delay 1 analogRead
-    Firmata.sendAnalog(analogPin, analogRead(analogPin)); 
-    analogPin = analogPin + 1;
-    if (analogPin >= TOTAL_ANALOG_PINS) analogPin = 0;
-}
-