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, 39 deletions

diff --git a/docs/source/arduino/loop.rst b/docs/source/arduino/loop.rst
deleted file mode 100644
index 165b7b0..0000000
--- a/docs/source/arduino/loop.rst
+++ /dev/null
@@ -1,39 +0,0 @@
-.. _arduino-loop:
-
-loop()
-======
-
-After creating a setup() function, which initializes and sets the
-initial values, the loop() function does precisely what its name
-suggests, and loops consecutively, allowing your program to change
-and respond. Use it to actively control the Arduino board.
-
-
-
-Example
-~~~~~~~
-
-::
-
-     
-    int buttonPin = 3;
-    
-    // setup initializes serial and the button pin
-    void setup()
-    {
-      beginSerial(9600);
-      pinMode(buttonPin, INPUT);
-    }
-    
-    // loop checks the button pin each time,
-    // and will send serial if it is pressed
-    void loop()
-    {
-      if (digitalRead(buttonPin) == HIGH)
-        serialWrite('H');
-      else
-        serialWrite('L');
-    
-      delay(1000);
-    }
-