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/cpp/bytecast.rst b/docs/source/lang/cpp/bytecast.rst
new file mode 100644
index 0000000..b3f0de2
--- /dev/null
+++ b/docs/source/lang/cpp/bytecast.rst
@@ -0,0 +1,50 @@
+.. highlight:: cpp
+
+.. _lang-bytecast:
+
+byte() (cast)
+=============
+
+Converts a value to the :ref:`byte <lang-byte>` data type.
+
+.. note::
+
+   Casting to the byte type is provided for compatibility with
+   Arduino.  However, the recommended Maple type for storing an 8-bit
+   unsigned integer is ``uint8``. (C and C++ programmers: ``stdint.h``
+   is also available).
+
+   In order to cast a variable ``x`` to a ``uint8``, the
+   following syntax can be used::
+
+       uint8(x);
+
+Syntax
+------
+
+``byte(x)``
+
+
+Parameters
+----------
+
+**x**: a value of any integer type
+
+
+Returns
+-------
+
+The value, converted to a ``byte``.  Note, however, that if the value
+is larger than the maximum value you can store in a byte (255), then
+the results might be strange and unexpected.
+
+
+See Also
+--------
+
+-  :ref:`lang-byte`
+
+
+
+
+.. include:: cc-attribution.txt