arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code Activity

Merged 1.0.2

Browse Source 
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
parent d5e7d0dabd 056ba5fca0
commit 23c7536dc7
22 changed files with 3583 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino
View File

@ -13,7 +13,7 @@
a final key combination (CTRL-U).
Circuit:
* Arduino Leonardo or Arduino Due
* Arduino Leonardo, Micro or Due
* wire to connect D2 to ground.
created 5 Mar 2012