1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00

Merged 1.0.2

Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	app/src/processing/app/debug/AvrdudeUploader.java
	build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino
	build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino
	build/shared/examples/09.USB/Keyboard/KeyboardSerial/KeyboardSerial.ino
	build/shared/examples/09.USB/Mouse/ButtonMouseControl/ButtonMouseControl.ino
	build/shared/examples/09.USB/Mouse/JoystickMouseControl/JoystickMouseControl.ino
	hardware/arduino/boards.txt
This commit is contained in:
Cristian Maglie
2012-11-04 22:49:14 +01:00
22 changed files with 3583 additions and 21 deletions

View File

@ -1,7 +1,7 @@
/*
Keyboard test
For Leonardo and Due boards only
For the Arduino Leonardo, Micro or Due
Reads a byte from the serial port, sends a keystroke back.
The sent keystroke is one higher than what's received, e.g.
@ -14,14 +14,14 @@
modified 27 Mar 2012
by Tom Igoe
This example code is in the public domain.
This example code is in the public domain.
http://www.arduino.cc/en/Tutorial/KeyboardSerial
*/
void setup() {
// open the serial port:
Serial.begin(9600);
Serial.begin(9600);
// initialize control over the keyboard:
Keyboard.begin();
}