Merge branch 'master' into debug-serialusb.

Chose debug-serialusb version in cases of conflict.

Conflicts:
	libmaple/usb/usb_callbacks.c

1 files changed, 0 insertions, 78 deletions

diff --git a/docs/source/arduino/tone.rst b/docs/source/arduino/tone.rst
deleted file mode 100644
index c7b1e44..0000000
--- a/docs/source/arduino/tone.rst
+++ /dev/null
@@ -1,78 +0,0 @@
-.. _arduino-tone:
-
-tone()
-======
-
-Description
------------
-
-Generates a square wave of the specified frequency (and 50% duty
-cycle) on a pin. A duration can be specified, otherwise the wave
-continues until a call to
-`noTone <http://arduino.cc/en/Reference/NoTone>`_\ (). The pin can be
-connected to a piezo buzzer or other speaker to play tones.
-
-
-
-Only one tone can be generated at a time. If a tone is already
-playing on a different pin, the call to tone() will have no effect.
-If the tone is playing on the same pin, the call will set its
-frequency.
-
-
-
-Use of the tone() function will interfere with PWM output on pins 3
-and 11 (on boards other than the Mega).
-
-
-
-**NOTE:** if you want to play different pitches on multiple pins,
-you need to call noTone() on one pin before calling tone() on the
-next pin.
-
-
-
-Syntax
-------
-
-tone(pin, frequency)
-tone(pin, frequency, duration)
-
-
-
-Parameters
-----------
-
-pin: the pin on which to generate the tone
-
-
-
-frequency: the frequency of the tone in hertz
-
-
-
-duration: the duration of the tone in milliseconds (optional)
-
-
-
-Returns
--------
-
-nothing
-
-
-
-See also
---------
-
-
--  `noTone <http://arduino.cc/en/Reference/NoTone>`_\ ()
--  `analogWrite <http://arduino.cc/en/Reference/AnalogWrite>`_\ ()
--  `Tutorial:Tone <http://arduino.cc/en/Tutorial/Tone>`_
--  `Tutorial:Pitch follower <http://arduino.cc/en/Tutorial/Tone2>`_
--  `Tutorial:Simple Keyboard <http://arduino.cc/en/Tutorial/Tone3>`_
--  `Tutorial: multiple tones <http://arduino.cc/en/Tutorial/Tone4>`_
-   
-
--  `Tutorial: PWM <http://arduino.cc/en/Tutorial/PWM>`_
-