Merge branch 'master' into debug-serialusb.

Chose debug-serialusb version in cases of conflict.

Conflicts:
	libmaple/usb/usb_callbacks.c

1 files changed, 50 insertions, 0 deletions

diff --git a/docs/source/lang/unimplemented/notone.rst b/docs/source/lang/unimplemented/notone.rst
new file mode 100644
index 0000000..485c9c5
--- /dev/null
+++ b/docs/source/lang/unimplemented/notone.rst
@@ -0,0 +1,50 @@
+.. _lang-notone:
+
+noTone()
+========
+
+Description
+-----------
+
+Stops the generation of a square wave triggered by
+`tone <http://arduino.cc/en/Reference/Tone>`_\ (). Has no effect if
+no tone is being generated.
+
+
+
+**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
+------
+
+noTone(pin)
+
+
+
+Parameters
+----------
+
+pin: the pin on which to stop generating the tone
+
+
+
+Returns
+-------
+
+nothing
+
+
+
+See also
+--------
+
+
+-  `tone <http://arduino.cc/en/Reference/Tone>`_ ()
+
+
+
+.. include:: /lang/cc-attribution.txt