Merge branch 'master' into debug-serialusb.

Chose debug-serialusb version in cases of conflict.

Conflicts:
	libmaple/usb/usb_callbacks.c

1 files changed, 46 insertions, 0 deletions

diff --git a/docs/source/lang/api/micros.rst b/docs/source/lang/api/micros.rst
new file mode 100644
index 0000000..f12976b
--- /dev/null
+++ b/docs/source/lang/api/micros.rst
@@ -0,0 +1,46 @@
+.. highlight:: cpp
+
+.. _lang-micros:
+
+micros()
+========
+
+Returns the number of microseconds since the Maple board began running
+the current program. This number will overflow (go back to zero),
+after approximately 70 minutes.
+
+.. note:: There are 1,000 microseconds in a millisecond, and 1,000,000
+   microseconds in a second.
+
+Library Documentation
+---------------------
+
+.. doxygenfunction:: micros
+
+Example
+-------
+
+::
+
+    unsigned int time;
+
+    void setup() {
+    }
+
+    void loop() {
+      SerialUSB.print("Time: ");
+      time = micros();
+      // prints time since program started
+      SerialUSB.println(time);
+      // wait a second so as not to send massive amounts of data
+      delay(1000);
+    }
+
+See Also
+--------
+
+-  :ref:`millis() <lang-millis>`
+-  :ref:`delay() <lang-delay>`
+-  :ref:`delayMicroseconds() <lang-delaymicroseconds>`
+
+.. include:: cc-attribution.txt