Merge branch 'master' into debug-serialusb.

Chose debug-serialusb version in cases of conflict.

Conflicts:
	libmaple/usb/usb_callbacks.c

1 files changed, 8 insertions, 1 deletions

diff --git a/wirish/comm/HardwareSerial.h b/wirish/comm/HardwareSerial.h
index f67f09a..aad8aa7 100644
--- a/wirish/comm/HardwareSerial.h
+++ b/wirish/comm/HardwareSerial.h
@@ -35,6 +35,13 @@
 
 #include "Print.h"
 
+/* NB: this class documented "by hand" (i.e., not using Doxygen) in:
+
+     libmaple/docs/source/lang/serial.rst
+
+   If you alter the public HardwareSerial interface, you must update
+   the documentation accordingly. */
+
 class HardwareSerial : public Print {
  private:
     uint8 usart_num;
@@ -52,7 +59,7 @@ class HardwareSerial : public Print {
                    uint8 rx_pin,
                    timer_dev_num timer_num,
                    uint8 compare_num);
-    void begin(uint32);
+    void begin(uint32 baud);
     void end(void);
     uint32 available(void);
     uint8 read(void);